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:21:17 +0100 |
| commit | 23898a47b0ca4563b61ba573cd5f5c16640dbdca (patch) | |
| tree | 9f0775ab6766dfe105ec69b4672fd5bb3d662cb7 /graphics/sprites/equipment | |
| parent | 40a624ca1d137432439dd3ddea59f7ece9b0fdd2 (diff) | |
| download | clientdata-23898a47b0ca4563b61ba573cd5f5c16640dbdca.tar.gz clientdata-23898a47b0ca4563b61ba573cd5f5c16640dbdca.tar.bz2 clientdata-23898a47b0ca4563b61ba573cd5f5c16640dbdca.tar.xz clientdata-23898a47b0ca4563b61ba573cd5f5c16640dbdca.zip | |
fix issues in items.xml and head equipment
Diffstat (limited to 'graphics/sprites/equipment')
| -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> |