1 files changed, 4 insertions, 0 deletions

diff --git a/ddl/out/LambdaCube.PipelineSchema.swift b/ddl/out/LambdaCube.PipelineSchema.swift
index 0c48df8..418ed7b 100644
--- a/ddl/out/LambdaCube.PipelineSchema.swift
+++ b/ddl/out/LambdaCube.PipelineSchema.swift
@@ -1,5 +1,9 @@
 // generated file, do not modify!
+<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
 // 2016-03-01T13:00:40.761274000000Z
+=======
+// 2016-03-20T21:42:12.892571000000Z
+>>>>>>> working c# backend
 
 enum StreamType {
   case Attribute_Word