User: deviantintegral Branch: HEAD Date: Sun, 30 May 2010 19:55:09 +0000 Modified files: /modules/resource_conflict resource_conflict.module Log message: #590200 by raphaelhuefner: Revisions causes wrong conflicts. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/resource_conflict/...