Fix left over merge conflicts

Author: Dr15Jones

FWCore/ParameterSet/python/Types.py

@@ -583,9 +583,6 @@ def _valueFromContainer(self, value):
             self.__startSub = value[1]
             self.__end      = value[2]
             self.__endSub   = value[3]
-
-
->>>>>>> 999d50d388e (Improvements to python configuration syntax)
     @staticmethod
     def _valueFromString(value:str):
         """only used for cfg-parsing"""
@@ -1194,7 +1191,6 @@ def pythonValueForItem(self,item, options:PrintOptions) -> str:
         elif isinstance(item, _Parameterizable):
             return item.dumpPython(options)
         return str(item)
->>>>>>> 999d50d388e (Improvements to python configuration syntax)
     @staticmethod
     def _valueFromString(value:str):
         return VLuminosityBlockID(*_ValidatingParameterListBase._itemsFromStrings(value,LuminosityBlockID._valueFromString))