From 73e138628a75f471bb5b7a66ceeb855d30e1c464 Mon Sep 17 00:00:00 2001
From: Simon Ehrenstein <stu200776@mail.uni-kiel.de>
Date: Thu, 6 Aug 2020 15:16:29 +0200
Subject: [PATCH] Cherry-pick to update docs

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

diff --git a/execution/README.md b/execution/README.md
index ec4bc13e8..cfc7dd729 100644
--- a/execution/README.md
+++ b/execution/README.md
@@ -142,7 +142,11 @@ 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