From bfd47a70ed691ab5faada47e42e080dd9fce5b66 Mon Sep 17 00:00:00 2001
From: miloyip <miloyip@gmail.com>
Date: Sun, 3 May 2015 20:30:46 +0800
Subject: [PATCH] Fix merge conflict

---
 test/unittest/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 4ff95d6..fb95b8e 100644
--- 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