From 10de287e9fdbdcae58048cc386416a4e72a5199b Mon Sep 17 00:00:00 2001
From: Csaba Hruska <csaba.hruska@gmail.com>
Date: Mon, 21 Mar 2016 14:11:09 +0100
Subject: improve java json

---
 ddl/out/LambdaCube.IR.swift | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ddl/out/LambdaCube.IR.swift')

diff --git a/ddl/out/LambdaCube.IR.swift b/ddl/out/LambdaCube.IR.swift
index 873d8e8..5c81d4b 100644
--- a/ddl/out/LambdaCube.IR.swift
+++ b/ddl/out/LambdaCube.IR.swift
@@ -1,4 +1,5 @@
 // generated file, do not modify!
+<<<<<<< d022971b99be214c71429d58f97f85b13e33a426
 <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
 <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
 <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
@@ -12,6 +13,9 @@
 =======
 // 2016-03-21T11:36:00.283777000000Z
 >>>>>>> work on java json loader
+=======
+// 2016-03-21T11:41:51.714241000000Z
+>>>>>>> improve java json
 
 typealias StreamName = Int
 
-- 
cgit v1.2.3