diff options
Diffstat (limited to 'ddl/out/LambdaCube.TypeInfo.hs')
| -rw-r--r-- | ddl/out/LambdaCube.TypeInfo.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ddl/out/LambdaCube.TypeInfo.hs b/ddl/out/LambdaCube.TypeInfo.hs index 7e1666e..b9b07a3 100644 --- a/ddl/out/LambdaCube.TypeInfo.hs +++ b/ddl/out/LambdaCube.TypeInfo.hs | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | -- generated file, do not modify! | 1 | -- generated file, do not modify! |
| 2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | ||
| 2 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 |
| 3 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 |
| 4 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
| @@ -12,6 +13,9 @@ | |||
| 12 | ======= | 13 | ======= |
| 13 | -- 2016-03-21T11:36:01.199696000000Z | 14 | -- 2016-03-21T11:36:01.199696000000Z |
| 14 | >>>>>>> work on java json loader | 15 | >>>>>>> work on java json loader |
| 16 | ======= | ||
| 17 | -- 2016-03-21T11:41:52.460562000000Z | ||
| 18 | >>>>>>> improve java json | ||
| 15 | 19 | ||
| 16 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} | 20 | {-# LANGUAGE OverloadedStrings, RecordWildCards #-} |
| 17 | module LambdaCube.TypeInfo where | 21 | module LambdaCube.TypeInfo where |