From 54612a04726bb652f758938d01c6ff2fdd5fbd55 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Wed, 19 Oct 2016 15:24:57 +0200
Subject: [PATCH] Resolve conflict

---
 DDCore/include/DD4hep/Primitives.h | 3 +--
 DDCore/include/DD4hep/World.h      | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index 54d880660..169e2fe24 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -1,4 +1,3 @@
-// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -11,7 +10,6 @@
 // Author     : M.Frank
 //
 //==========================================================================
-
 #ifndef DD4HEP_DD4HEP_PRIMITIVES_H
 #define DD4HEP_DD4HEP_PRIMITIVES_H
 
@@ -20,6 +18,7 @@
 #include <vector>
 #include <string>
 #include <limits>
+
 #include <typeinfo>
 #include <algorithm>
 #include <stdexcept>
diff --git a/DDCore/include/DD4hep/World.h b/DDCore/include/DD4hep/World.h
index 990e4ddf3..121d70ac8 100644
--- a/DDCore/include/DD4hep/World.h
+++ b/DDCore/include/DD4hep/World.h
@@ -1,4 +1,3 @@
-// $Id$
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -11,7 +10,6 @@
 // Author     : M.Frank
 //
 //==========================================================================
-
 #ifndef DD4HEP_WORLD_H
 #define DD4HEP_WORLD_H
 
-- 
GitLab