diff options
| author | Reid <reidyaro@gmail.com> | 2015-10-30 16:53:56 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2015-11-05 23:24:50 +0100 |
| commit | f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56 (patch) | |
| tree | a74a36cbce850f44061fbeab4b9c3a5e4b54cebd /graphics/sprites/npcs/xml | |
| parent | fdebf408408214236eef2bcc31cb93315e1fde47 (diff) | |
| download | clientdata-f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56.tar.gz clientdata-f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56.tar.bz2 clientdata-f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56.tar.xz clientdata-f2a2f9d947a0e34c7a5f80f2bf00f199b4231a56.zip | |
Fix Rumli's merge.
Diffstat (limited to 'graphics/sprites/npcs/xml')
| -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 --> |