diff options
| author | Reid <reidyaro@gmail.com> | 2015-10-30 16:53:56 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2015-10-30 16:53:56 +0100 |
| commit | 849001882604e96c57cbcaf2e87b083dd899662e (patch) | |
| tree | 0509077bb5fcf2ff4f59e2e5c28fdf8f942225be | |
| parent | a7f3db6828b4d540db87ea5abf9b3e70e9f2bb94 (diff) | |
| download | clientdata-849001882604e96c57cbcaf2e87b083dd899662e.tar.gz clientdata-849001882604e96c57cbcaf2e87b083dd899662e.tar.bz2 clientdata-849001882604e96c57cbcaf2e87b083dd899662e.tar.xz clientdata-849001882604e96c57cbcaf2e87b083dd899662e.zip | |
Fix Rumli's merge.
| -rw-r--r-- | graphics/sprites/npcs/xml/rumli.xml | 1 |
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 --> |