From d52830e6cd1476ddf3c5b78637a118c57fdb973b Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 10 Sep 2018 13:17:03 +0200
Subject: fix issues with koga and lumberjack, fix license file

---
 graphics/sprites/npcs/xml/richard.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'graphics/sprites/npcs/xml/richard.xml')

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>
-- 
cgit v1.2.3-60-g2f50