summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/009-4/_mobs.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/npc/009-4/_mobs.txt b/npc/009-4/_mobs.txt
index ac3429f1..5984a97e 100644
--- a/npc/009-4/_mobs.txt
+++ b/npc/009-4/_mobs.txt
@@ -1,3 +1,10 @@
+<<<<<<< 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
@@ -25,5 +32,6 @@ OnSilkworm:
callfunc "MobPoints";
break;
+>>>>>>> 4b3d76c606ab0edd54628342adbbb7245b21087f
end;
}