blob: 41ced7c00ad0bd188a63899543e16a05702eac6f (
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_x3x3" tilewidth="96" tileheight="96" tilecount="12" columns="6">
<image source="swamp_x3x3.png" width="576" height="192"/>
</tileset>
=======
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.2.4" name="swamp_x3x3" tilewidth="96" tileheight="96" tilecount="12" columns="6">
<image source="swamp_x3x3.png" width="576" height="192"/>
</tileset>
>>>>>>> 943bfabd7537c6adcbe37e2e46dba29016463ce7
|
