1 files changed, 4 insertions, 0 deletions

diff --git a/ddl/out/LambdaCube.PipelineSchema.cpp b/ddl/out/LambdaCube.PipelineSchema.cpp
index 4ec50ce..45e4dce 100644
--- a/ddl/out/LambdaCube.PipelineSchema.cpp
+++ b/ddl/out/LambdaCube.PipelineSchema.cpp
@@ -1,4 +1,5 @@
 // generated file, do not modify!
+<<<<<<< d022971b99be214c71429d58f97f85b13e33a426
 <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
 <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
 <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
@@ -12,6 +13,9 @@
 =======
 // 2016-03-21T11:36:01.075399000000Z
 >>>>>>> work on java json loader
+=======
+// 2016-03-21T11:41:52.343859000000Z
+>>>>>>> improve java json
 
 #include "LambdaCube.PipelineSchema.hpp"
 template<> json toJSON<std::shared_ptr<StreamType>>(std::shared_ptr<StreamType> &v) {