summaryrefslogtreecommitdiff
path: root/ddl/out/TestData.swift
diff options
context:
space:
mode:
authorCsaba Hruska <csaba.hruska@gmail.com>2016-03-21 14:11:09 +0100
committerCsaba Hruska <csaba.hruska@gmail.com>2016-03-21 14:14:04 +0100
commit10de287e9fdbdcae58048cc386416a4e72a5199b (patch)
treea4090ea5ca7e7996a60b60104ed35670d26695ed /ddl/out/TestData.swift
parentd022971b99be214c71429d58f97f85b13e33a426 (diff)
improve java json
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 15ea32f..be520e2 100644
--- a/ddl/out/TestData.swift
+++ b/ddl/out/TestData.swift
@@ -1,4 +1,5 @@
1// generated file, do not modify! 1// generated file, do not modify!
2<<<<<<< d022971b99be214c71429d58f97f85b13e33a426
2<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 3<<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277
3<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 4<<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45
4<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 5<<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9
@@ -12,6 +13,9 @@
12======= 13=======
13// 2016-03-21T11:36:01.244766000000Z 14// 2016-03-21T11:36:01.244766000000Z
14>>>>>>> work on java json loader 15>>>>>>> work on java json loader
16=======
17// 2016-03-21T11:41:52.508392000000Z
18>>>>>>> improve java json
15 19
16enum ClientInfo { 20enum ClientInfo {
17 case ClientInfo(ClientInfo_Data) 21 case ClientInfo(ClientInfo_Data)