This commit is contained in:
Andreas Troelsen
2011-07-18 15:27:01 +02:00
parent d44e208c79
commit a73e93ee6f
2 changed files with 0 additions and 4 deletions
BIN
View File
Binary file not shown.
-4
View File
@@ -1,10 +1,6 @@
name: MobArena name: MobArena
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
<<<<<<< HEAD
version: 0.93.2 version: 0.93.2
=======
version: 0.93.1
>>>>>>> da8c77082ed69d7d4ebc00cdfd480fa7df67c2ad
softdepend: [MultiVerse,XcraftGate] softdepend: [MultiVerse,XcraftGate]
commands: commands:
ma: ma: