Resolve merge conflict.

This commit is contained in:
Sunstrike committed 2013-10-28 22:50:12 +00:00
commit 96cafa8499
1 file changed
-19
-19
View File
@@ -1,19 +0,0 @@
[
{
"modid": "Mantle",
"name": "Mantle",
"description": "",
"version": "@VERSION@",
"credits": "",
"logoFile": "Mantle.png",
"mcversion": "1.6.2",
"url": "",
"updateUrl": "",
"authors": [ "Sunstrike" ],
"parent":"",
"screenshots": [],
"dependencies": [
"mod_MinecraftForge"
]
}
]