diff options
| -rw-r--r-- | maps/008-1-1.tmx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx index 70d86e2f..0bb1198c 100644 --- a/maps/008-1-1.tmx +++ b/maps/008-1-1.tmx @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<<<<<<< f25ea506ae33e212e101f3f7f0993289f3bda014 -<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="80"> -======= <map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="270" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="78"> ->>>>>>> Update woodland maps, add 008-1-2 swamp map, add required swamp tilesets <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> |