[contributions(DRUPAL-6--2):darrick] /modules/merci merci.module /modules/merci/modules/merci_staff merci_staff.module /modules/merci/tests merci.test

User: darrick Branch: DRUPAL-6--2 Date: Mon, 10 Jan 2011 05:59:14 +0000 Modified files: /modules/merci merci.module /modules/merci/modules/merci_staff merci_staff.module /modules/merci/tests merci.test Log message: Fixed bug for conflicts with two resources of the same type. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/tests/merci....