summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2010-12-29 21:40:17 +0100
committerStefan Beller <stefanbeller@googlemail.com>2010-12-29 21:40:17 +0100
commitba51eb01c31f1fa0e23f3a94565973928584d575 (patch)
tree803fb072e7c1acef3e655bf8a9a8456efce6d16c
parentc884add9efd2a76072a0be64c6c84c73dc0bb2bc (diff)
downloadserverdata-ba51eb01c31f1fa0e23f3a94565973928584d575.tar.gz
serverdata-ba51eb01c31f1fa0e23f3a94565973928584d575.tar.bz2
serverdata-ba51eb01c31f1fa0e23f3a94565973928584d575.tar.xz
serverdata-ba51eb01c31f1fa0e23f3a94565973928584d575.zip
repair orum and waric again
-rw-r--r--npc/009-4/_mobs.txt9
1 files changed, 0 insertions, 9 deletions
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;
}