diff options
author | Micksha <Micksha@users.noreply.github.com> | 2018-07-30 19:49:55 +0200 |
---|---|---|
committer | Micksha <Micksha@users.noreply.github.com> | 2018-11-06 12:13:07 +0100 |
commit | 68b2e9449243d6ab3533348cea75a962a99fef84 (patch) | |
tree | 183bf72e8b041baae9e4544da08e1e55d59dda0a /graphics/sprites/equipment/head/brimmedhat.xml | |
parent | 9307b6787b7c515b471240abb67d9cc0c7114990 (diff) | |
download | clientdata-68b2e9449243d6ab3533348cea75a962a99fef84.tar.gz clientdata-68b2e9449243d6ab3533348cea75a962a99fef84.tar.bz2 clientdata-68b2e9449243d6ab3533348cea75a962a99fef84.tar.xz clientdata-68b2e9449243d6ab3533348cea75a962a99fef84.zip |
fix issues in items.xml and head equipment
Diffstat (limited to 'graphics/sprites/equipment/head/brimmedhat.xml')
-rw-r--r-- | graphics/sprites/equipment/head/brimmedhat.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml index 4ecbe157..3bce3a6e 100644 --- a/graphics/sprites/equipment/head/brimmedhat.xml +++ b/graphics/sprites/equipment/head/brimmedhat.xml @@ -5,12 +5,8 @@ Copyright (C) 2014 Evol Online --> <imageset name="base" src="graphics/sprites/equipment/head/brimmedhat.png" width="27" -<<<<<<< HEAD height="20" offsetY="-10"/> -======= - height="20"/> ->>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df <include file="equipment/head/pumpkinhat.xml"/> </sprite> |