diff options
Diffstat (limited to 'ddl/out/TestData.cpp')
| -rw-r--r-- | ddl/out/TestData.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ddl/out/TestData.cpp b/ddl/out/TestData.cpp index 8b2cdf5..b7d4d31 100644 --- a/ddl/out/TestData.cpp +++ b/ddl/out/TestData.cpp | |||
| @@ -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 | ||
| 4 | #include "TestData.hpp" | 8 | #include "TestData.hpp" |
| 5 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { | 9 | template<> json toJSON<std::shared_ptr<ClientInfo>>(std::shared_ptr<ClientInfo> &v) { |