cleanup

3497fab3 · Niels · d14366c3 · 3497fab3
Commit 3497fab3 authored Jun 23, 2016 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

README.md README.md +0 -4

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