Merge branch 'master' into c-runtime

2021-07-30 11:20:04 +02:00
parent eece3e86b3 265f08d6ee
commit 155657709a
211 changed files with 7161 additions and 58549 deletions
--- a/src/compiler/GF/Infra/Location.hs
+++ b/src/compiler/GF/Infra/Location.hs
@@ -1,5 +1,6 @@
 -- | Source locations
 module GF.Infra.Location where
+import Prelude hiding ((<>))
 import GF.Text.Pretty

 -- ** Source locations