From 04e26a79235ceb942ff743651b765fdaed1ce35f Mon Sep 17 00:00:00 2001
From: jpolton <jelt@noc.ac.uk>
Date: Fri, 26 Apr 2019 16:30:45 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 573c9e4..8e3f076 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,6 @@ BoBEAS
 | | |____scripinterp.patch
 | | |____scripinterp_mod.patch
 | | |____scripshape.patch
-<<<<<<< HEAD
-=======
-
-
->>>>>>> fd4ebfd3f245c028265f50995d167b3f6af98dd5
 |
 |____SCRIPTS
 | |____load_modules_1.sh
-- 
GitLab