From fdebf408408214236eef2bcc31cb93315e1fde47 Mon Sep 17 00:00:00 2001
From: Dan Sagunov <danilka.pro@gmail.com>
Date: Fri, 30 Oct 2015 16:06:59 +0300
Subject: Added Rumli NPC

---
 graphics/sprites/npcs/xml/rumli.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'graphics')

diff --git a/graphics/sprites/npcs/xml/rumli.xml b/graphics/sprites/npcs/xml/rumli.xml
index 9988cca4..ebf11328 100644
--- a/graphics/sprites/npcs/xml/rumli.xml
+++ b/graphics/sprites/npcs/xml/rumli.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?xml version="1.0"?>
 <!-- Author : Reid
 Copyright (C) 2010-2015  Evol Online -->
-- 
cgit v1.2.3-60-g2f50