summaryrefslogtreecommitdiff
path: root/tiled
diff options
context:
space:
mode:
authorstuebinm2022-03-19 20:20:20 +0100
committerstuebinm2022-03-19 20:21:14 +0100
commit80cc9d0f70e98ff9b8aa78c86891d4a9bb4759d5 (patch)
tree0c0151ebfa7b7b87b4906532b93452afb1dd39a8 /tiled
parentdbf2253dc4256809b255767cbf4ae9c236f18542 (diff)
unbreak a very, very long rebase
Diffstat (limited to '')
-rw-r--r--tiled/Data/Tiled/Abstract.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tiled/Data/Tiled/Abstract.hs b/tiled/Data/Tiled/Abstract.hs
index 574a0ae..89c40b4 100644
--- a/tiled/Data/Tiled/Abstract.hs
+++ b/tiled/Data/Tiled/Abstract.hs
@@ -4,9 +4,9 @@ module Data.Tiled.Abstract where
import Universum
-import Data.Tiled (Layer (..), Object (..), Property (..),
+import Data.Tiled (GlobalId, Layer (..), Object (..), Property (..),
PropertyValue (..), Tile (..), Tiledmap (..),
- Tileset (..), GlobalId)
+ Tileset (..), mkTiledId)
import qualified Data.Vector as V
class HasProperties a where
@@ -65,7 +65,7 @@ instance HasName Tileset where
instance HasName Property where
getName (Property n _) = n
instance HasName Tile where
- getName tile = "[tile with global id " <> showText (tileId tile) <> "]"
+ getName tile = "[tile with global id " <> show (tileId tile) <> "]"
class IsProperty a where