summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sprites/npcs')
-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 28a701fa..d0765ba4 100644
--- a/graphics/sprites/npcs/xml/richard.xml
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -1,9 +1,13 @@
<?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>