User: bradfordcp Branch: HEAD Date: Sun, 24 May 2009 04:28:40 +0000 Added files: /modules/conflict_resolver README.txt Log message: Adding project to CVS as per SoC instructions on g.d.o Links: http://cvs.drupal.org/diff.php?path=contributions/modules/conflict_resolver/...