diff options
Diffstat (limited to 'ddl/out/TestData.hpp')
| -rw-r--r-- | ddl/out/TestData.hpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/ddl/out/TestData.hpp b/ddl/out/TestData.hpp index cc11915..d1645fe 100644 --- a/ddl/out/TestData.hpp +++ b/ddl/out/TestData.hpp | |||
| @@ -1,21 +1,5 @@ | |||
| 1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
| 2 | <<<<<<< d022971b99be214c71429d58f97f85b13e33a426 | 2 | // 2016-03-21T13:14:18.341517000000Z |
| 3 | <<<<<<< 4d40c4ee5ed15544d2ac7fb1ea7b61e89766d277 | ||
| 4 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
| 5 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | ||
| 6 | // 2016-03-01T13:00:40.829757000000Z | ||
| 7 | ======= | ||
| 8 | // 2016-03-20T21:42:13.043021000000Z | ||
| 9 | >>>>>>> working c# backend | ||
| 10 | ======= | ||
| 11 | // 2016-03-20T22:19:43.692329000000Z | ||
| 12 | >>>>>>> fix c# | ||
| 13 | ======= | ||
| 14 | // 2016-03-21T11:36:01.244766000000Z | ||
| 15 | >>>>>>> work on java json loader | ||
| 16 | ======= | ||
| 17 | // 2016-03-21T11:41:52.508392000000Z | ||
| 18 | >>>>>>> improve java json | ||
| 19 | 3 | ||
| 20 | #ifndef HEADER_TestData_H | 4 | #ifndef HEADER_TestData_H |
| 21 | #define HEADER_TestData_H | 5 | #define HEADER_TestData_H |