summaryrefslogtreecommitdiff
path: root/graphics/sprites/npcs/xml/koga.xml
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sprites/npcs/xml/koga.xml')
-rw-r--r--graphics/sprites/npcs/xml/koga.xml11
1 files changed, 0 insertions, 11 deletions
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>