blob: 5b86fcd6587e81be2aee9f461ca4d0fe72db2e66 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
|
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.2.4" name="swamp_accessory" tilewidth="32" tileheight="32" tilecount="600" columns="50">
<image source="swamp_accessory.png" width="1600" height="384"/>
</tileset>
=======
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.2.4" name="swamp_accessory" tilewidth="32" tileheight="32" tilecount="600" columns="50">
<image source="swamp_accessory.png" width="1600" height="384"/>
</tileset>
>>>>>>> 943bfabd7537c6adcbe37e2e46dba29016463ce7
|
