From f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Fri, 30 Oct 2015 16:53:56 +0100
Subject: Fix Rumli's merge.

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

(limited to 'graphics')

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