User: jcmc Branch: HEAD Date: Wed, 28 Apr 2010 21:46:24 +0000 Modified files: /modules/gallery_assist_comments README.TXT test_1.txt test_2.txt Log message: The merging option create conflicts Links: http://cvs.drupal.org/diff.php?path=contributions/modules/gallery_assist_com... http://cvs.drupal.org/diff.php?path=contributions/modules/gallery_assist_com... http://cvs.drupal.org/diff.php?path=contributions/modules/gallery_assist_com...