Remove leftovers of merges

InnerDetector/InDetConfig/python/InDetRecToolConfig.py

@@ -353,15 +353,6 @@ def SCT_FlaggedConditionToolCfg(flags, name="SCT_FlaggedConditionTool", **kwargs
   result.setPrivateTools(tool)
   return result
 
-#<<<<<<< HEAD
-#def SCT_MonitorConditionsToolCfg(flags, name="InDetSCT_MonitorConditionsTool", **kwargs):
-#  acc = ComponentAccumulator()
-#  folder="/SCT/Derived/Monitoring"
-
-#  acc.merge(addFolders(flags,folder, "SCT_OFL", className="CondAttrListCollection"))
-
-#  acc.addCondAlgo(CompFactory.SCT_MonitorCondAlg( "SCT_MonitorCondAlg",ReadKey = folder))
-#=======
 
 def SCT_MonitorConditionsToolCfg(flags, name="InDetSCT_MonitorConditionsTool", cond_kwargs={}, **kwargs):
   cond_kwargs.setdefault("Folder", "/SCT/Derived/Monitoring")
@@ -376,7 +367,6 @@ def SCT_MonitorConditionsToolCfg(flags, name="InDetSCT_MonitorConditionsTool", c
 
   result.addCondAlgo( CompFactory.SCT_MonitorCondAlg(name    = cond_kwargs["MonitorCondAlgName"],
                                                      ReadKey = cond_kwargs["Folder"] ))
-#>>>>>>> robert/inDetRecToolsConfig
 
   tool = CompFactory.SCT_MonitorConditionsTool(name, **kwargs)
   result.setPrivateTools(tool)

graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt

@@ -19,16 +19,6 @@ find_package( Qt5 COMPONENTS Core Gui Widgets )
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC TRUE )
 
-# Build the library.
-#<<<<<<< HEAD
-#atlas_add_library( ${pkgName} ${pkgName}/*.h src/*.cxx src/*.qrc 
-#   PUBLIC_HEADERS ${pkgName}
-#   INCLUDE_DIRS ${SOQT_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${QT5_INCLUDE_DIRS} 
-#   PRIVATE_INCLUDE_DIRS tmpqt_extraheaders/ ${CMAKE_CURRENT_BINARY_DIR} ${ROOT_INCLUDE_DIRS}
-#   LINK_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets ${SOQT_LIBRARIES} ${COIN3D_LIBRARIES} GeoPrimitives TFPersistification 
-#   PRIVATE_LINK_LIBRARIES VP1GuideLineSystems VP1GeometrySystems 
-#)
-#=======
 atlas_add_library( VP1GeometryPlugin
    VP1GeometryPlugin/*.h src/*.cxx src/*.qrc 
    PUBLIC_HEADERS VP1GeometryPlugin