From c67b678f2b4872962bbc37c6cf272cf4e1ad5b03 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 10 Sep 2018 13:08:06 +0200
Subject: add a bunch of hurns NPCs - most of them LEGACY versions, to be
 changed one by one

---
 graphics/sprites/npcs/xml/richard.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'graphics/sprites/npcs')

diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
index be90738d..c3a3f843 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>
-- 
cgit v1.2.3-60-g2f50