diff options
Diffstat (limited to 'ddl/out/TestData2.hpp')
| -rw-r--r-- | ddl/out/TestData2.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ddl/out/TestData2.hpp b/ddl/out/TestData2.hpp index a88050a..7f1d4b3 100644 --- a/ddl/out/TestData2.hpp +++ b/ddl/out/TestData2.hpp | |||
| @@ -1,9 +1,13 @@ | |||
| 1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
| 2 | <<<<<<< c5e063b3c9aeff65161e24445e9672daff980b45 | ||
| 2 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 | 3 | <<<<<<< 3b50722f433ec5ecc515ea1441fd633d85118cb9 |
| 3 | // 2016-03-01T13:00:40.829757000000Z | 4 | // 2016-03-01T13:00:40.829757000000Z |
| 4 | ======= | 5 | ======= |
| 5 | // 2016-03-20T21:42:13.043021000000Z | 6 | // 2016-03-20T21:42:13.043021000000Z |
| 6 | >>>>>>> working c# backend | 7 | >>>>>>> working c# backend |
| 8 | ======= | ||
| 9 | // 2016-03-20T22:19:43.692329000000Z | ||
| 10 | >>>>>>> fix c# | ||
| 7 | 11 | ||
| 8 | #ifndef HEADER_TestData_H | 12 | #ifndef HEADER_TestData_H |
| 9 | #define HEADER_TestData_H | 13 | #define HEADER_TestData_H |