1
0

Fixing a bad merge.

This commit is contained in:
rWatcher 2009-08-20 20:42:16 -04:00
parent 221d7777cc
commit b1eeb65185

View File

@ -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