User: bradfordcp Branch: HEAD Date: Sun, 21 Jun 2009 20:52:04 +0000 Modified files: /modules/conflict_resolver conflict_resolver.module Log message: First attempt at merging title, body, and CCK fields automatically. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...