From a73e93ee6f62b61bf1e88ad35febc42a2f67ce43 Mon Sep 17 00:00:00 2001
From: Andreas Troelsen <garbagemule@gmail.com>
Date: Mon, 18 Jul 2011 15:27:01 +0200
Subject: [PATCH] Bla!

---
 MobArena.jar   | Bin 121801 -> 121747 bytes
 bin/plugin.yml |   4 ----
 2 files changed, 4 deletions(-)

diff --git a/MobArena.jar b/MobArena.jar
index 5cfaf8484891f5815932a0f109019e4e7a49d45b..903c370798a6c25c16770c0839b618cc0f43b078 100644
GIT binary patch
delta 388
zcmX@Poqh6lcAfxlW)?061`Y-W_v(o}noMrhjpkd;85bO@*RB3!r?X>SB@ZJ5!!2e8
z2B0d2f}GOy%sjoy+?=%&4tgCi5NLbfy6^CvJsGiIQu3<=Q@*cis+h6u@?DR~nkP$A
z54M}nU8bSak!n6&?d*5|G`sd`UN;I#-=9pJ7iqGtWmfJ+*Z7Ci-dqSYyf1G5U|x-Z
z%+1ik^5{EHA|HfF)xSDvs=6n)&F@UH%ZpE2zuh>c%(eG<q)yI7(}ib@8M=QlW@ucw
z_hr#nIRgO|zNl~eXGz~wJhIH|$1K0h*yt91vplQVgO_(qmu1Yl?w;emWBHMFrT^LA
zMA#%22i#y`%v<>WgTV6U^Rn4*oE&C8E_tzXn#G?Pb&mI&H`q=4cl>9PRbAE9EavnQ
zBO&iS8vBp*viW^lEIQ5N(W^7lf)29Idv=5=xcG@kcyVw2tzT>b-i%Bl%&>5r?s|gJ
d5*U)(8%{8?3-h4{<n*bx8THs0PXI%e0RRd-t2qDw

delta 457
zcmbQdo&Dr?cAfxlW)?061`Y;>hgB1KG?^Y$HJWcVXIyZszOw3*-Oo#!lbskD7))3g
z7=Wr63UW%*GxPK+b92^Ci1$8hAae9R^IyL2XT{f+_LXXD`G~mQS<Ut6aBk7=&{<1V
zZl*kFH}{PeVNbgG&imio;^OoE3zzVSS<ROYk}&LCda5B?Qvc$U9V$E5X}r7tIRBw*
zbV0rK{>~e1J-S=V>(xHKv5|9qvuW*p{dB?IS==msm9x|?3wECLS(4;q=`W<mWjIfb
zb=jgBOKMt_lETFO0(`wvKJ1DJUsv<V_vMdPX`MT=R#n|I<RcdenRQDv9NECYvFXl~
zt=z&fi&bBg1Y~?xE?XQMEpOg@{@azSD_ttCFU|5-|8U{W-7W^^e%bn5*BuM}eoK6-
z@0eQF7Le1tV+&siV`*#jd_KD{s~deXEN9o<zIJ3T|NR~FFJ5_2@?*{J??3nK{~OxI
z$ai8%AkRagFU~hu4#(9vwJY|N)FpVu9%h_Vb(|q+Z>oG)ZGZixUrYhsj7%cTu+aZx
n2Ml01;G8aZf>8??9oxN5FtQ8tp~lAa_}h$nZ009`QNsWLn~lG6

diff --git a/bin/plugin.yml b/bin/plugin.yml
index 3b10de3..d7dc33e 100644
--- a/bin/plugin.yml
+++ b/bin/plugin.yml
@@ -1,10 +1,6 @@
 name: MobArena
 main: com.garbagemule.MobArena.MobArena
-<<<<<<< HEAD
 version: 0.93.2
-=======
-version: 0.93.1
->>>>>>> da8c77082ed69d7d4ebc00cdfd480fa7df67c2ad
 softdepend: [MultiVerse,XcraftGate]
 commands:
   ma: