Fix merge conflict

bfd47a70 · miloyip · 7fc71600 · bfd47a70
Commit bfd47a70 authored May 03, 2015 by miloyip
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

CMakeLists.txt test/unittest/CMakeLists.txt +0 -3

No files found.
--- 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