1 files changed, 1 insertions, 17 deletions

diff --git a/ddl/out/LambdaCube.TypeInfo.purs b/ddl/out/LambdaCube.TypeInfo.purs
index 1871220..a2f85e3 100644
--- a/ddl/out/LambdaCube.TypeInfo.purs
+++ b/ddl/out/LambdaCube.TypeInfo.purs
@@ -1,21 +1,5 @@
 -- generated file, do not modify!
-<<<<<<< d022971b99be214c71429d58f97f85b13e33a426
-<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
-<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
-<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
--- 2016-03-01T13:00:40.810157000000Z
-=======
--- 2016-03-20T21:42:12.996366000000Z
->>>>>>> working c# backend
-=======
--- 2016-03-20T22:19:43.646837000000Z
->>>>>>> fix c#
-=======
--- 2016-03-21T11:36:01.199696000000Z
->>>>>>> work on java json loader
-=======
--- 2016-03-21T11:41:52.460562000000Z
->>>>>>> improve java json
+-- 2016-03-21T13:14:18.260874000000Z
 
 module LambdaCube.TypeInfo where
 import Prelude