blob: aa939b66a5c1ca9f06800c3a5c4b98af72f63f4c (
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_house" tilewidth="32" tileheight="32" tilecount="72" columns="9">
<image source="swamp_house.png" width="288" height="257"/>
</tileset>
=======
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.2.4" name="swamp_house" tilewidth="32" tileheight="32" tilecount="72" columns="9">
<image source="swamp_house.png" width="288" height="257"/>
</tileset>
>>>>>>> 943bfabd7537c6adcbe37e2e46dba29016463ce7
|
