diff options
Diffstat (limited to 'graphics/sprites/equipment/head/brimmedhat.xml')
| -rw-r--r-- | graphics/sprites/equipment/head/brimmedhat.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml index 3bce3a6e..4ecbe157 100644 --- a/graphics/sprites/equipment/head/brimmedhat.xml +++ b/graphics/sprites/equipment/head/brimmedhat.xml @@ -5,8 +5,12 @@ 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> |