From d8b31ca0679d6f9cc74c44d9bc35a6523968cc26 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <mhodgkin@aiatlas025.cern.ch>
Date: Thu, 7 Jan 2021 10:37:33 +0100
Subject: [PATCH] Remove text lines from MR conflict that should not have been
 kept.

---
 .../eflowRec/share/run_ESDStandardReco_FlowElements.py          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py b/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
index ca5d3d5a0ee8..405ffe1369d9 100644
--- a/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
+++ b/Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
@@ -36,7 +36,6 @@ rec.doCaloRinger.set_Value_and_Lock(False)
 #Turn of TAG
 rec.doWriteTAG.set_Value_and_Lock(False)
 
-<<<<<<< Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
 #disables VertexCnvAlg
 from InDetRecExample.InDetJobProperties import jobproperties
 jobproperties.InDetJobProperties.doxAOD.set_Value_and_Lock(False)
@@ -51,7 +50,6 @@ CaloNoiseCondAlg(noisetype="electronicNoise")
 
 athenaCommonFlags.EvtMax=30
 #Run pflopw jet finding - this cannot be enabled via reconstruction flags currently! (without enabling other things we don't want)
->>>>>>> Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
 UserAlgs = ["eflowRec/jetAlgs.py"]
 include ("RecExCommon/RecExCommon_topOptions.py")
 
-- 
GitLab