-
Finn Teegen authored
Conflicts: src/Base/CurryTypes.hs src/Base/Expr.hs src/Base/TopEnv.hs src/Base/TypeSubst.hs src/Base/Types.hs src/Base/Typing.hs src/Base/Utils.hs src/Checks.hs src/Checks/ExportCheck.hs src/Checks/ImportSyntaxCheck.hs src/Checks/InterfaceCheck.hs src/Checks/InterfaceSyntaxCheck.hs src/Checks/KindCheck.hs src/Checks/PrecCheck.hs src/Checks/SyntaxCheck.hs src/Checks/TypeCheck.hs src/Checks/WarnCheck.hs src/CompilerEnv.hs src/CompilerOpts.hs src/CurryDeps.hs src/Env/Interface.hs src/Env/TypeConstructor.hs src/Env/Value.hs src/Exports.hs src/Generators.hs src/Generators/GenAbstractCurry.hs src/Generators/GenFlatCurry.hs src/Html/SyntaxColoring.hs src/IL/Pretty.hs src/IL/ShowModule.hs src/IL/Type.hs src/Imports.hs src/Modules.hs src/Transformations/CaseCompletion.hs src/Transformations/CurryToIL.hs src/Transformations/Desugar.hs src/Transformations/Lift.hs src/Transformations/Qual.hs src/Transformations/Simplify.hs
0eaebcd7