fixing merge errors

xAOD/xAODTruth/xAODTruth/TruthEvent.h

@@ -11,10 +11,6 @@
 #include "xAODBase/ObjectType.h"
 
 // Local include(s):
-<<<<<<< HEAD
-=======
-#include "xAODTruth/TruthEventBase.h"
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 #include "xAODTruth/TruthParticleContainer.h"
 #include "xAODTruth/TruthVertexContainer.h"
 
@@ -182,12 +178,9 @@ namespace xAOD {
       /// Pointer to the incoming primary particle
       const TruthParticle* primaryParticle() const;
 
-<<<<<<< HEAD
       /// Get the link to the primary particle
       const TruthParticleLink_t& primaryParticleLink() const;
 
-=======
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
       /// Set incoming primary particle
       void setPrimaryParticleLink( const TruthParticleLink_t& pcl);
 
@@ -195,8 +188,7 @@ namespace xAOD {
 
       /// The type of the object as a simple enumeration
       virtual Type::ObjectType type() const;
-<<<<<<< HEAD
-      
+
       /// @name Simple truth meta data properties 
       /// @{
 
@@ -207,8 +199,6 @@ namespace xAOD {
       void setWeightNames( const std::vector< std::string >& value );
 
       /// @}
-=======
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
       /// Function making sure that the object is ready for persistification
       void toPersistent();
@@ -217,11 +207,4 @@ namespace xAOD {
 
 } // namespace xAOD
 
-<<<<<<< HEAD
-=======
-// Declare the base class of TruthEvent to StoreGate:
-#include "xAODCore/BaseInfo.h"
-SG_BASE( xAOD::TruthEvent, SG::AuxElement );
-
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 #endif // XAODTRUTH_TRUTHEVENT_H

xAOD/xAODTruth/xAODTruth/TruthParticle.h

-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHPARTICLE_H
 #define XAODTRUTH_TRUTHPARTICLE_H
 
@@ -357,24 +356,5 @@ namespace xAOD {
    }; // class TruthParticle
 
 } // namespace xAOD
-=======
-// -*- C++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef XAODTRUTH_TRUTHPARTICLE_H
-#define XAODTRUTH_TRUTHPARTICLE_H
-
-#include "xAODTruth/versions/TruthParticle_v1.h"
-
-namespace xAOD {
-
-  /// Typedef to implementation
-  typedef TruthParticle_v1 TruthParticle;
-
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 #endif

xAOD/xAODTruth/xAODTruth/TruthParticleAuxContainer.h

-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
 #define XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
 
@@ -40,25 +39,6 @@ namespace xAOD {
   }; // class TruthParticleAuxContainer
 
 } // namespace xAOD
-=======
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TruthParticleAuxContainer.h 622193 2014-10-16 16:08:34Z krasznaa $
-#ifndef XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
-#define XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
-
-// Local include(s):
-#include "xAODTruth/versions/TruthParticleAuxContainer_v1.h"
-
-namespace xAOD {
-   /// Declare the latest version of the truth particle auxiliary container
-   typedef TruthParticleAuxContainer_v1 TruthParticleAuxContainer;
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 // Declare a CLID for the class
 #include "xAODCore/CLASS_DEF.h"

xAOD/xAODTruth/xAODTruth/TruthVertex.h

-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHVERTEX_H
 #define XAODTRUTH_TRUTHVERTEX_H
 
@@ -139,24 +138,5 @@ namespace xAOD {
    }; // class TruthVertex
 
 } // namespace xAOD
-=======
-// -*- C++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef XAODTRUTH_TRUTHVERTEX_H
-#define XAODTRUTH_TRUTHVERTEX_H
-
-#include "xAODTruth/versions/TruthVertex_v1.h"
-
-namespace xAOD {
-
-  /// Typedef to implementation
-  typedef TruthVertex_v1 TruthVertex;
-
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 #endif

xAOD/xAODTruth/xAODTruth/TruthVertexAuxContainer.h

-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
 #define XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
 
@@ -43,25 +42,6 @@ namespace xAOD {
   }; // class TruthVertexAuxContainer
 
 } // namespace xAOD
-=======
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TruthVertexAuxContainer.h 622081 2014-10-16 00:55:18Z abuckley $
-#ifndef XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
-#define XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
-
-// Local include(s):
-#include "xAODTruth/versions/TruthVertexAuxContainer_v1.h"
-
-namespace xAOD {
-   /// Declare the latest version of the truth vertex auxiliary container
-   typedef TruthVertexAuxContainer_v1 TruthVertexAuxContainer;
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 // Declare a CLID for the class
 #include "xAODCore/CLASS_DEF.h"