summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/npcs/xml/rumli.xml1
1 files changed, 0 insertions, 1 deletions
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 -->