User: bradfordcp Branch: HEAD Date: Mon, 24 Aug 2009 15:06:28 +0000 Modified files: /modules/conflict_resolver README.txt conflict_resolver.module Log message: Snapshot of the code during the final day of Google Summer of Code. Automatic resolution is implemented and functioning (although it needs a bit more testing when it comes to CCK). Manual resolution is still under heavy development. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...