From c5e063b3c9aeff65161e24445e9672daff980b45 Mon Sep 17 00:00:00 2001
From: Csaba Hruska <csaba.hruska@gmail.com>
Date: Sun, 20 Mar 2016 22:44:29 +0100
Subject: working c# backend

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

(limited to 'ddl/out/LambdaCube.PipelineSchema.purs')

diff --git a/ddl/out/LambdaCube.PipelineSchema.purs b/ddl/out/LambdaCube.PipelineSchema.purs
index 1f741cb..a1919a1 100644
--- a/ddl/out/LambdaCube.PipelineSchema.purs
+++ b/ddl/out/LambdaCube.PipelineSchema.purs
@@ -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
 
 module LambdaCube.PipelineSchema where
 import Prelude
-- 
cgit v1.2.3