diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-01-19 09:36:24 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-19 09:36:24 +0000 |
commit | 91627698793a7f310501024cd1d195555a2a08ca (patch) | |
tree | f994f9587d3e827b703bf9e43ecdf561f902b58f /npc | |
parent | 6a92fbc8e20a211d85e0656cc86bb3569389b85b (diff) | |
parent | 603911e22d65bde062a6b8331616701fbc111d7d (diff) | |
download | serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.gz serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.bz2 serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.xz serverdata-91627698793a7f310501024cd1d195555a2a08ca.zip |
Merge commit 'mainline/master'
Diffstat (limited to 'npc')
-rw-r--r-- | npc/functions/barber.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index 57c3c598..ceba8fd8 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -20,8 +20,8 @@ L_Style: "Center parting/Short and slick", -, "Long and slick", -, "Short and curly", -, - "Long and curly", -, "Pigtails", -, + "Long and curly", -, "Parted", -, "Supprise me", -, "Nah, I'm fine", L_Done; |