Merge branch 'master' of ssh://c4science.ch/source/HeLaZ

2a320f39 · Antoine Cyril David Hoffmann · 05211e67 · c771f993 · 2a320f39
Commit 2a320f39 authored 4 years ago by Antoine Cyril David Hoffmann
--- a/README.md
+++ b/README.md
 HeLaZ (Hermite-Laguerre Z-pinch solver, 2020)

+<<<<<<< HEAD
 {demo_phi_00.gif, layout=left, float, size=full, alt="a duckling"}
+=======
+![] (demo_phi_00.gif)
+>>>>>>> c771f993830de3832803cd5cc3b5eda2f3e46d43

 Roadmap : (Current version 1.4)