From 7554268c57d45ab1b350e4b5403d452dea5f8711 Mon Sep 17 00:00:00 2001 From: scott snyder <scott.snyder@cern.ch> Date: Tue, 16 Jun 2020 15:26:18 +0200 Subject: [PATCH] Remove some useless comments that could be confused with conflict markers. --- .../MuonCombinedBaseTools/src/MuonCaloTagTool.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx index cb54becfc0e1..9dfdec550926 100644 --- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx +++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx @@ -13,7 +13,6 @@ // (c) ATLAS Combined Muon software ////////////////////////////////////////////////////////////////////////////// -//<<<<<< INCLUDES >>>>>> #include "MuonCombinedToolInterfaces/IMuonCombinedTagTool.h" #include "MuonCombinedEvent/InDetCandidate.h" @@ -42,7 +41,6 @@ namespace MuonCombined { - //<<<<<< CLASS STRUCTURE INITIALIZATION >>>>>> MuonCaloTagTool::MuonCaloTagTool (const std::string& type, const std::string& name, const IInterface* parent) : AthAlgTool(type, name, parent), @@ -92,7 +90,6 @@ namespace MuonCombined { MuonCaloTagTool::~MuonCaloTagTool() {} - //<<<<<< PUBLIC MEMBER FUNCTION DEFINITIONS >>>>>> StatusCode MuonCaloTagTool::initialize() { -- GitLab