Merge branch 'feature-a/newer-json' into 'dev'

Update json.hpp Closes #2615 See merge request !72

Merge branch 'feature-a/newer-json' into 'dev'
Update json.hpp Closes #2615 See merge request !72
0f294f13 · Mathieu Giraud · 1db9a920 · 717eea9e · 0f294f13 · 1db9a920
Commit 0f294f13 authored Sep 14, 2017 by Mathieu Giraud
--- a/algo/lib/info.txt
+++ b/algo/lib/info.txt
@@ -12,7 +12,7 @@
    * @license          LGPL
    json                : Json library
-    * @version          ??
+    * @version          2.1.1
    * @author           Niels Lohmann
    * @link             https://github.com/nlohmann/json
    * @license          MIT

--- a/algo/lib/json.h
+++ b/algo/lib/json.h
--- a/algo/lib/json.hpp
+++ b/algo/lib/json.hpp
--- a/algo/tests/should-get-tests/vidjil-error-incorrect-germlines.should-get
+++ b/algo/tests/should-get-tests/vidjil-error-incorrect-germlines.should-get
@@ -2,5 +2,5 @@
 !EXIT_CODE: 1
 $ Error, incorrect *.g
-1:error.* cannot open .g file
+1:error.* cannot properly read