User: darrick Branch: DRUPAL-6--2 Date: Fri, 04 Feb 2011 21:43:34 +0000 Modified files: /modules/merci merci.module /modules/merci/theme merci_conflict_grid.tpl.php theme.inc Log message: Fixed some issues with merci conflict grid. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/merci_... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/theme/theme....