User: aaron Branch: HEAD Date: Tue, 27 Jan 2009 18:49:05 +0000 Modified files: /modules/media/resource changelog.txt resource.module Log message: remove conflicts from resource.module Links: http://cvs.drupal.org/diff.php?path=contributions/modules/media/resource/cha... http://cvs.drupal.org/diff.php?path=contributions/modules/media/resource/res...