summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs/xml/richard.xml
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-07-20 13:09:52 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 12:33:37 +0100
commit10993b4459341860cdfac4ae5b953c0264b09fc0 (patch)
tree8ec07694d4bf6ab5d64f5e77cab040c12b21f5c1 /graphics/sprites/npcs/xml/richard.xml
parent79c4d50564dfedbff7a2e72b0bdaa8055e6f2d16 (diff)
downloadclientdata-10993b4459341860cdfac4ae5b953c0264b09fc0.tar.gz
clientdata-10993b4459341860cdfac4ae5b953c0264b09fc0.tar.bz2
clientdata-10993b4459341860cdfac4ae5b953c0264b09fc0.tar.xz
clientdata-10993b4459341860cdfac4ae5b953c0264b09fc0.zip
Add the first few npcs: old Koga, Lumberjack, Richard.
Diffstat (limited to 'graphics/sprites/npcs/xml/richard.xml')
-rw-r--r--graphics/sprites/npcs/xml/richard.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index c307b530..be90738d 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
<!-- Author: Micksha
+=======
+<!-- Author: Reid
+>>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
Copyright (C) 2015 Evol Online -->
<sprite>