Skip to content

J
json
Commit 3497fab3 authored by Niels's avatar Niels
Browse files
Options

cleanup

parent d14366c3
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
README.md
View file @ 3497fab3
...@@ -502,11 +502,7 @@ $ make ...@@ -502,11 +502,7 @@ $ make
$ ./json_unit "*" $ ./json_unit "*"
=============================================================================== ===============================================================================
<<<<<<< HEAD
All tests passed (5568722 assertions in 32 test cases) 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). For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment