matplotlib version 2.0.1 fixes bug (https://github.com/matplotlib/matplotlib/pull/7914)

4f453e47 · Matevz Golob · Matevz Golob · a52838e0 · 4f453e47
Commit 4f453e47 authored Jun 07, 2019 by Matevz Golob Committed by Matevz Golob Jul 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

software/wendelin/software.cfg software/wendelin/software.cfg +7 -0

No files found.
--- a/software/wendelin/software.cfg
+++ b/software/wendelin/software.cfg
@@ -76,10 +76,17 @@ repository = https://lab.nexedi.com/nexedi/wendelin.git
 branch = master

 [versions]
+<<<<<<< HEAD
 msgpack = 0.6.1
 msgpack-numpy = 0.4.4.3
 <<<<<<< HEAD
 wendelin.core = 0.12
 =======
 wendelin.core = 0.13
+<<<<<<< HEAD
 >>>>>>> wendelin: v↑ wendelin.core  (v0.13)
+=======
+=======
+msgpack = 0.5.6
+msgpack-numpy = 0.4.4.2
+wendelin.core = 0.12