summaryrefslogtreecommitdiff
path: root/world/map/npc/022-1/mapflags.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@gmx.de>2013-08-25 18:01:05 +0200
committerJessica Tölke <jtoelke@gmx.de>2013-08-25 18:01:05 +0200
commit803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch)
tree67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/022-1/mapflags.txt
parent36c6803069bfe3be37d482e682a3167b8bf0363d (diff)
parentb3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff)
downloadserverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz
serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2
serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz
serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/022-1/mapflags.txt')
-rw-r--r--world/map/npc/022-1/mapflags.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
index f1b0444b..cb3434b7 100644
--- a/world/map/npc/022-1/mapflags.txt
+++ b/world/map/npc/022-1/mapflags.txt
@@ -1,2 +1,2 @@
-022-1.gat mapflag no_player_drops
-022-1.gat mapflag town
+022-1.gat|mapflag|no_player_drops
+022-1.gat|mapflag|town