From ba51eb01c31f1fa0e23f3a94565973928584d575 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 29 Dec 2010 21:40:17 +0100
Subject: repair orum and waric again

---
 npc/009-4/_mobs.txt | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'npc/009-4/_mobs.txt')

diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
index 5984a97e..b4f88c00 100644
--- a/npc/009-4/_mobs.txt
+++ b/npc/009-4/_mobs.txt
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-// 009-4 mobs
-
-
-
-009-4.gat,0,0,0	script	Mob009-4	-1,{
-=======
 // 009-4 Cave mobs
 // # see detailed description at orum.txt
 // Cavern
@@ -31,7 +24,5 @@ OnSilkworm:
 	set @mobID, 1035;
 	callfunc "MobPoints";
 	break;
-
->>>>>>> 4b3d76c606ab0edd54628342adbbb7245b21087f
 	end;
 }
-- 
cgit v1.2.3-60-g2f50