1 files changed, 4 insertions, 0 deletions

diff --git a/ddl/out/LambdaCube.Mesh.swift b/ddl/out/LambdaCube.Mesh.swift
index e300c0f..ff4ac52 100644
--- a/ddl/out/LambdaCube.Mesh.swift
+++ b/ddl/out/LambdaCube.Mesh.swift
@@ -1,5 +1,9 @@
 // generated file, do not modify!
+<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
 // 2016-03-01T13:00:40.781208000000Z
+=======
+// 2016-03-20T21:42:12.936741000000Z
+>>>>>>> working c# backend
 
 enum MeshAttribute {
   case A_Float(Array<Float>)