From f2e50aced9ca29e3923262f1b341c9ff71c9f024 Mon Sep 17 00:00:00 2001
From: Erik Post <erik@shinsetsu.nl>
Date: Tue, 23 Oct 2018 14:57:24 +0200
Subject: [PATCH] Fix broken merge commit. #98

---
 src/Language/Program.hs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/Language/Program.hs b/src/Language/Program.hs
index 3d9cea7..1175310 100644
--- a/src/Language/Program.hs
+++ b/src/Language/Program.hs
@@ -26,23 +26,6 @@ data Exp
  | ExpT TransformExp
  | ExpQ QueryExp
 
-<<<<<<< ryan
-instance Deps Exp where
- deps x = case x of
-  ExpTy e -> deps e
-  ExpS e -> deps e
-  ExpI e -> deps e
-  ExpM e -> deps e
-  ExpT e -> deps e
-  ExpQ e -> deps e
-
-data KindCtx ts s i m q t o = KindCtx {
-    typesides :: Ctx String ts
-  , schemas :: Ctx String s
-  , instances :: Ctx String i
-  , mappings :: Ctx String m
-  , queries :: Ctx String q
-=======
 data KindCtx ts s i m q t o
   = KindCtx
   { typesides  :: Ctx String ts
@@ -50,7 +33,6 @@ data KindCtx ts s i m q t o
   , instances  :: Ctx String i
   , mappings   :: Ctx String m
   , queries    :: Ctx String q
->>>>>>> master
   , transforms :: Ctx String t
   , other      :: o
   }