summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-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;
}