Correct one more py file

cms-sw · Mar 30, 2016 · b6c31eb · b6c31eb
1 parent f6461e5
commit b6c31eb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py
@@ -216,11 +216,7 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
-<<<<<<< HEAD
-        'Geometry/HcalCommonData/data/PhaseII/hcalRecNumbering.xml',
-=======
         'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
->>>>>>> Forgot to commit the python
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/HGCalCommonData/data/v7/hgcal.xml',
         'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',