Fix merge conflict

2015-05-03 20:30:46 +08:00 · 2015-05-03 20:30:46 +08:00 · bfd47a70ed
commit bfd47a70ed
parent 7fc716006f
1 changed files with 0 additions and 3 deletions
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@ -8,11 +8,8 @@ set(UNITTEST_SOURCES
    itoatest.cpp
    jsoncheckertest.cpp
    namespacetest.cpp
-<<<<<<< HEAD
    pointertest.cpp
-=======
    prettywritertest.cpp
->>>>>>> master
    readertest.cpp
 	simdtest.cpp
    stringbuffertest.cpp