From 0403320b20faefc3bc4641f0dbef4cf756fbf710 Mon Sep 17 00:00:00 2001
From: Simon Ehrenstein <simon.ehrenstein@gmail.com>
Date: Tue, 22 Sep 2020 12:23:01 +0200
Subject: [PATCH] Cherry-pick to update docs

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

diff --git a/execution/README.md b/execution/README.md
index cfc7dd729..9e3a49aa8 100644
--- a/execution/README.md
+++ b/execution/README.md
@@ -142,11 +142,7 @@ Depending on your setup, some additional adjustments may be necessary:
 
 ## Execution
 
-<<<<<<< HEAD
-Please note that **Python 3.7** installation is required for executing Theodolite.
-=======
 Please note that a **Python 3.7** installation is required for executing Theodolite.
->>>>>>> e8849b0... Update execution/README.md
 
 The `./theodolite.py` is the entrypoint for all benchmark executions. Is has to be called as follows:
 
-- 
GitLab