summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs/xml
diff options
context:
space:
mode:
authorDan Sagunov <danilka.pro@gmail.com>2015-10-30 16:06:59 +0300
committerReid <reidyaro@gmail.com>2015-11-05 23:24:50 +0100
commitfdebf408408214236eef2bcc31cb93315e1fde47 (patch)
tree605cf6860a7f9da53e127d3feca117c7c0bf09e8 /graphics/sprites/npcs/xml
parentf8c41fe23dce4302324947e75efce25a7a398253 (diff)
downloadclientdata-fdebf408408214236eef2bcc31cb93315e1fde47.tar.gz
clientdata-fdebf408408214236eef2bcc31cb93315e1fde47.tar.bz2
clientdata-fdebf408408214236eef2bcc31cb93315e1fde47.tar.xz
clientdata-fdebf408408214236eef2bcc31cb93315e1fde47.zip
Added Rumli NPC
Diffstat (limited to 'graphics/sprites/npcs/xml')
-rw-r--r--graphics/sprites/npcs/xml/rumli.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/sprites/npcs/xml/rumli.xml b/graphics/sprites/npcs/xml/rumli.xml
index 9988cca4..ebf11328 100644
--- a/graphics/sprites/npcs/xml/rumli.xml
+++ b/graphics/sprites/npcs/xml/rumli.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<?xml version="1.0"?>
<!-- Author : Reid
Copyright (C) 2010-2015 Evol Online -->