From 68e22bb9aa70f657e726b0a5d2352b31e9ff8051 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

---
 npcs.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'npcs.xml')

diff --git a/npcs.xml b/npcs.xml
index 09aa8db2..81ac2c75 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -384,13 +384,11 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="173">
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <!-- LEGACY - Mid-aged Man, Chef.  -->
         <sprite variant="3">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="174">
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
         <!-- LEGACY - Young sexy lady with Rabbit Ears.  -->
         <sprite variant="4">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
@@ -723,7 +721,6 @@ IDs 900-999 = Special
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
     <npc id="451">
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
         <!-- HURNS - Elven Female, walking sprite for Melinda NPC. -->
         <sprite>races/elven-female.xml</sprite>
         <sprite>equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293</sprite>
@@ -731,30 +728,21 @@ IDs 900-999 = Special
         <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
         <sprite>equipment/neck/copper-necklace.xml|#315a67,a4a4ae,dce5d6,ffffff</sprite>
         <sprite>hairstyles/hairstyle22.xml|#16211f,162e29,195145,1d7a62,29a27a,51de9c,c9f7bc</sprite>
-=======
-        <!-- Human Male, removing his monocle for winking. -->
-        <sprite>npcs/xml/richard.xml</sprite>
-        <menu name="Talk" command="talk 'NAME'"/>
     </npc>
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
     <npc id="452">
         <!-- Legendary Luberjack. -->
         <sprite>npcs/xml/lumberjack.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
-=======
->>>>>>> add a bunch of hurns NPCs - most of them LEGACY versions, to be changed one by one
     <npc id="453">
         <!-- Human with legacy Ranger Hat and a Scythe. -->
         <sprite>npcs/xml/hinnak.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-<<<<<<< f542316432d2f4aad709c04d577ed91b3ea6e392
-        <npc id="454">
+    <npc id="454">
         <!-- Human Male, removing his monocle for winking. -->
         <sprite>npcs/xml/richard.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
     </npc>
 =======
 >>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
-- 
cgit v1.2.3-60-g2f50