gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
miloyip 2015-05-03 20:30:46 +08:00
parent 7fc716006f
commit bfd47a70ed
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/unittest/CMakeLists.txt
View File

@ -8,11 +8,8 @@ set(UNITTEST_SOURCES
itoatest.cpp itoatest.cpp
jsoncheckertest.cpp jsoncheckertest.cpp
namespacetest.cpp namespacetest.cpp
<<<<<<< HEAD
pointertest.cpp pointertest.cpp
=======
prettywritertest.cpp prettywritertest.cpp
>>>>>>> master
readertest.cpp readertest.cpp
simdtest.cpp simdtest.cpp
stringbuffertest.cpp stringbuffertest.cpp