From 3497fab3b539850c1d2e69f0ee20edf9ee42c9e1 Mon Sep 17 00:00:00 2001
From: Niels <niels.lohmann@gmail.com>
Date: Thu, 23 Jun 2016 05:55:48 +0200
Subject: [PATCH] cleanup

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 9f0737fb..4bb8b0be 100644
--- a/README.md
+++ b/README.md
@@ -502,11 +502,7 @@ $ make
 $ ./json_unit "*"
 
 ===============================================================================
-<<<<<<< HEAD
 All tests passed (5568722 assertions in 32 test cases)
-=======
-All tests passed (5568721 assertions in 32 test cases)
->>>>>>> develop
 ```
 
 For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).