summaryrefslogtreecommitdiff
path: root/npc/000-1
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-01-08 21:34:20 -0500
committergumi <mekolat@users.noreply.github.com>2017-01-08 21:34:20 -0500
commitdbf252c0621fc5ebd003f9bda3cef9423ab467ee (patch)
tree4051a711f8320b31135a4ed30afc3138c97ca985 /npc/000-1
parent6609552ed1edfba54e449fa2f8fce757b67fbac7 (diff)
parent669c1d964329a9a97bab6d2b0e227339c9df36a9 (diff)
downloadserverdata-dbf252c0621fc5ebd003f9bda3cef9423ab467ee.tar.gz
serverdata-dbf252c0621fc5ebd003f9bda3cef9423ab467ee.tar.bz2
serverdata-dbf252c0621fc5ebd003f9bda3cef9423ab467ee.tar.xz
serverdata-dbf252c0621fc5ebd003f9bda3cef9423ab467ee.zip
Merge remote-tracking branch 'alige/consistency'
Diffstat (limited to 'npc/000-1')
-rw-r--r--npc/000-1/chest.txt2
-rw-r--r--npc/000-1/shop.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 79dc6a5b..fd9ebf30 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -1,9 +1,9 @@
// Evol scripts.
// Authors:
// 4144
+// gumi
// Hal9000
// Reid
-// gumi
// Description:
// A treasure chest, with... Treasures inside!
// Variable:
diff --git a/npc/000-1/shop.txt b/npc/000-1/shop.txt
index 581f36b1..44b3479a 100644
--- a/npc/000-1/shop.txt
+++ b/npc/000-1/shop.txt
@@ -1,7 +1,7 @@
// Evol scripts.
-// Author:
-// Reid
+// Authors:
// 4144
+// Reid
// Description:
// Fexil's shop bag.