diff options
| author | Micksha <Micksha@users.noreply.github.com> | 2020-11-13 17:33:48 +0100 |
|---|---|---|
| committer | Micksha <Micksha@users.noreply.github.com> | 2020-11-13 17:33:48 +0100 |
| commit | ce25ad82c48be7cac10ef36701b6c67a208de363 (patch) | |
| tree | 1a4006f48266a117382874471291538037a7f84d | |
| parent | e8226040a1f1578db8c15976b3e37bc841c38481 (diff) | |
| download | clientdata-ce25ad82c48be7cac10ef36701b6c67a208de363.tar.gz clientdata-ce25ad82c48be7cac10ef36701b6c67a208de363.tar.bz2 clientdata-ce25ad82c48be7cac10ef36701b6c67a208de363.tar.xz clientdata-ce25ad82c48be7cac10ef36701b6c67a208de363.zip | |
fix something (not breaking, hopefully) in ranger hat
| -rw-r--r-- | graphics/sprites/equipment/head/rangerhat.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/graphics/sprites/equipment/head/rangerhat.xml b/graphics/sprites/equipment/head/rangerhat.xml index c96af388..ad9f3926 100644 --- a/graphics/sprites/equipment/head/rangerhat.xml +++ b/graphics/sprites/equipment/head/rangerhat.xml @@ -1,17 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Author: Micksha Copyright (C) 2020 rEvolt --> -<<<<<<< HEAD -<sprite> - <saedit> - <layer type="repeater" file="races/demon-male.xml"/> - <layer type="background" color="rgba(128,128,128,0.5)" zindex="-2"/> - </saedit> -======= <sprite> ->>>>>>> 2d0c4f74a7490f4d074cdf4774e279890f517925 <imageset name="base" src="graphics/sprites/equipment/head/rangerhat.png" width="42" |