summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs/xml/richard.xml
diff options
context:
space:
mode:
authorMicksha <Micksha@users.noreply.github.com>2018-09-10 13:17:03 +0200
committerMicksha <Micksha@users.noreply.github.com>2018-11-06 12:55:13 +0100
commitd52830e6cd1476ddf3c5b78637a118c57fdb973b (patch)
tree49f30200ce2fa9c244f03bef0cac84bbc9a03bb0 /graphics/sprites/npcs/xml/richard.xml
parent44f319744c1a37cd4b5b48b4e58d27057efa6700 (diff)
downloadclientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.gz
clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.bz2
clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.tar.xz
clientdata-d52830e6cd1476ddf3c5b78637a118c57fdb973b.zip
fix issues with koga and lumberjack, fix license file
Diffstat (limited to 'graphics/sprites/npcs/xml/richard.xml')
-rw-r--r--graphics/sprites/npcs/xml/richard.xml8
1 files changed, 0 insertions, 8 deletions
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index d0765ba4..d59cfe9d 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
<!-- Author: Micksha
-=======
-<!-- Author: Reid
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
-=======
-<!-- Author: Micksha
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
Copyright (C) 2015 Evol Online -->
<sprite>