From 4fd0f785887509f4490365b5d332d39eaeb23a54 Mon Sep 17 00:00:00 2001
From: Leigh Catherine Schaefer <leigh.schaefer@cern.ch>
Date: Mon, 25 Sep 2017 15:58:49 +0200
Subject: [PATCH] removing git diff message which was added to master in MR4776
Former-commit-id: 5cbd75941d2e2a9662f39824af14ce7ab46eec1f
---
.../InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index b7fb6d54bc9..45d35002e40 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -356,7 +356,6 @@ if dumpTrtInfo:
topSequence += InDetPRD_Association
print InDetPRD_Association
->>>>>>> 6627d0e4f2... Merge branch '21.0-TRTxAODUpdates' into '21.0'
if dumpSctInfo:
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import SCT_PrepDataToxAOD
xAOD_SCT_PrepDataToxAOD = SCT_PrepDataToxAOD( name = "xAOD_SCT_PrepDataToxAOD")
--
GitLab