From 349740d642055fc3bc3e6d63bfdd5b610598d1e4 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Tue, 27 Oct 2020 11:52:04 +0100
Subject: [PATCH] gif in readme?

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 4e4ed7d2..f293043b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
 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)
 
-- 
GitLab