[contributions:bradfordcp] /modules/conflict_resolver conflict_resolver.module /modules/conflict_resolver/engines/system sys_diff.module /modules/conflict_resolver/engines/xdiff xdiff.module

User: bradfordcp Branch: HEAD Date: Thu, 11 Jun 2009 04:08:53 +0000 Modified files: /modules/conflict_resolver conflict_resolver.module /modules/conflict_resolver/engines/system sys_diff.module /modules/conflict_resolver/engines/xdiff xdiff.module Log message: Generating a listing of nodes with conflicts. Currently cleaning up that UI. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/... http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...