Fixing a bad merge.
This commit is contained in:
parent
221d7777cc
commit
b1eeb65185
@ -1,8 +1,3 @@
|
|||||||
<<<<<<< HEAD:modules/itemchecksum/module.info
|
|
||||||
name = "ItemChecksum"
|
name = "ItemChecksum"
|
||||||
description = "Display's a photo or video's MD5 and SHA-1 checksum."
|
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
|
version = 1
|
||||||
|
Reference in New Issue
Block a user