From 80cc9d0f70e98ff9b8aa78c86891d4a9bb4759d5 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sat, 19 Mar 2022 20:20:20 +0100
Subject: unbreak a very, very long rebase

---
 tiled/Data/Tiled/Abstract.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tiled')

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
-- 
cgit v1.2.3