wendelin: v↑ wendelin.core (v0.13)

/reviewed-by: TrustMe

wendelin: v↑ wendelin.core (v0.13)
/reviewed-by: TrustMe
f61a86e0 · Kirill Smelkov · Matevz Golob · da7f719d · f61a86e0
Commit f61a86e0 authored Jun 18, 2019 by Kirill Smelkov Committed by Matevz Golob Jul 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

software/wendelin/software.cfg software/wendelin/software.cfg +5 -2

No files found.
--- a/software/wendelin/software.cfg
+++ b/software/wendelin/software.cfg
@@ -72,11 +72,14 @@ jupyter-enable-default = true
 [wendelin]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
-repository = https://lab.nexedi.com/klaus/wendelin.git
+repository = https://lab.nexedi.com/nexedi/wendelin.git
 branch = master

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