Fix broken merge commit. #98

statebox · Oct 23, 2018 · f2e50ac · f2e50ac
1 parent 4ff630c
commit f2e50ac
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/src/Language/Program.hs b/src/Language/Program.hs
@@ -26,31 +26,13 @@ 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
   , schemas    :: Ctx String s
   , instances  :: Ctx String i
   , mappings   :: Ctx String m
   , queries    :: Ctx String q
->>>>>>> master
   , transforms :: Ctx String t
   , other      :: o
   }