summaryrefslogtreecommitdiff
path: root/ddl/out/TestData.swift
diff options
context:
space:
mode:
Diffstat (limited to 'ddl/out/TestData.swift')
-rw-r--r--ddl/out/TestData.swift4
1 files changed, 4 insertions, 0 deletions
diff --git a/ddl/out/TestData.swift b/ddl/out/TestData.swift
index adb9e25..6e31913 100644
--- a/ddl/out/TestData.swift
+++ b/ddl/out/TestData.swift
@@ -1,5 +1,9 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
2// 2016-03-01T13:00:40.829757000000Z 3// 2016-03-01T13:00:40.829757000000Z
4=======
5// 2016-03-20T21:42:13.043021000000Z
6>>>>>>> working c# backend
3 7
4enum ClientInfo { 8enum ClientInfo {
5 case ClientInfo(ClientInfo_Data) 9 case ClientInfo(ClientInfo_Data)