From b1eeb65185c995c7355f24adb2f66da6753cb7e3 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@australia.edu>
Date: Thu, 20 Aug 2009 20:42:16 -0400
Subject: [PATCH] Fixing a bad merge.

---
 modules/itemchecksum/module.info | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/itemchecksum/module.info b/modules/itemchecksum/module.info
index 85616968..0dda6880 100644
--- a/modules/itemchecksum/module.info
+++ b/modules/itemchecksum/module.info
@@ -1,8 +1,3 @@
-<<<<<<< HEAD:modules/itemchecksum/module.info
 name = "ItemChecksum"
 description = "Display's a photo or video's MD5 and SHA-1 checksum."
-=======
-name = ItemChecksum
-description = Display's a photo or video's MD5 and SHA-1 checksum.
->>>>>>> gallery3-contrib/master:modules/itemchecksum/module.info
 version = 1