From 650a19fc4e6522ba237d764f99930106be23840b Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Tue, 6 Apr 2021 09:17:53 +0200
Subject: [PATCH] correct readme

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

diff --git a/README.md b/README.md
index 387016e3..df9dde36 100644
--- a/README.md
+++ b/README.md
@@ -54,15 +54,9 @@ How to run it
 
 	2.4 2D cartesian parallel (along p and kr)
 
-<<<<<<< HEAD
 #2.5 GK Sugama collision operator
 
 	2.6 GPU accelerated version
-=======
-#	2.5 GK Sugama collision operator
-
-  2.6 GPU accelerated version
->>>>>>> e0f1973e4234da1ac2089c60ed313fed401da75d
 
 	2.7 GK Full Coulomb collision operator
 
-- 
GitLab