From 9c1e4f708afbf28913c0b56551e973c3dc2aa213 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Mon, 10 Sep 2018 13:27:46 +0200
Subject: lumberjack and koga still messy, trying to fix

---
 graphics/sprites/npcs/xml/koga.xml       | 11 -----------
 graphics/sprites/npcs/xml/lumberjack.xml | 24 +++++++-----------------
 2 files changed, 7 insertions(+), 28 deletions(-)

(limited to 'graphics/sprites/npcs')

diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
index b95e610b..6b3f17ad 100644
--- a/graphics/sprites/npcs/xml/koga.xml
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -1,4 +1,3 @@
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Author: Micksha
 Copyright (C) 2018 Evol Online -->
@@ -14,14 +13,4 @@ Copyright (C) 2018 Evol Online -->
             <frame index="0"/>
         </animation>
     </action>
-=======
-<?xml version="1.0"?>
-<sprite variants="1" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/npcs/sprite/koga.png" width="634" height="477"/>
-  <action name="stand" imageset="npc">
-    <animation direction="default">
-      <frame index="0"/>
-    </animation>
-  </action>
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
 </sprite>
diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml
index 5603e511..d4cb81ae 100644
--- a/graphics/sprites/npcs/xml/lumberjack.xml
+++ b/graphics/sprites/npcs/xml/lumberjack.xml
@@ -1,8 +1,10 @@
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Reid, Micksha
-Copyright (C) 2010-2018 Evol Online -->
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/>
+  <action name="stand" imageset="npc">
+    <animation direction="default">
 
+      <!-- eyes movements -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/npcs/sprite/lumberjack.png"
@@ -11,25 +13,13 @@ Copyright (C) 2010-2018 Evol Online -->
 
     <action name="stand" imageset="base">
         <animation direction="default">
-=======
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/>
-  <action name="stand" imageset="npc">
-    <animation direction="default">
-      <!-- eyes movements -->
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
       <frame index="0" delay="3000"/>
       <frame index="1" delay="80"/>
       <frame index="0" delay="1500"/>
       <frame index="1" delay="80"/>
       <frame index="0" delay="3000"/>
       <frame index="1" delay="300"/>
-<<<<<<< 21c4c83ea02e1292391aaa7fdbaf3dc3202a100a
         </animation>
     </action>
-=======
-    </animation>
-  </action>
->>>>>>> Add the first few npcs: old Koga, Lumberjack, Richard.
+
 </sprite>
-- 
cgit v1.2.3-70-g09d2