mirror of
https://github.com/nlohmann/json
synced 2024-11-09 22:20:05 +00:00
cleanup
This commit is contained in:
parent
d14366c33e
commit
3497fab3b5
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user