summaryrefslogtreecommitdiff
path: root/npc/009-1_Hurnscald/jack.txt
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-06 12:58:55 -0700
committerJared Adams <jaxad0127@gmail.com>2009-03-06 12:58:55 -0700
commit2a73e3544d6ac4d4f000c621753d70e8695e203c (patch)
treeb3784983e268ecf01a506229255116ac64fb0f57 /npc/009-1_Hurnscald/jack.txt
parent7464175373616085130e0d2e3b9ddc8e0322f291 (diff)
parent3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff)
downloadserverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz
serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip
Merge commit 'mainline/master'
Conflicts: conf/magic.conf
Diffstat (limited to 'npc/009-1_Hurnscald/jack.txt')
-rw-r--r--npc/009-1_Hurnscald/jack.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt
index 71c0a901..eaf9788d 100644
--- a/npc/009-1_Hurnscald/jack.txt
+++ b/npc/009-1_Hurnscald/jack.txt
@@ -240,7 +240,6 @@ L_Shield_state_3:
close;
S_NohMask_Ask:
- next;
menu
"I'll keep that in mind.", -,
"Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;