style: minor simplifications

DIRACGrid · Jun 5, 2024 · d16bda3 · d16bda3
1 parent a6e354f
commit d16bda3
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py b/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py
@@ -31,22 +31,14 @@ class DownloadInputData:
     #############################################################################
     def __init__(self, argumentsDict):
         """Standard constructor"""
-<<<<<<< HEAD
-=======
-        self.name = COMPONENT_NAME
->>>>>>> 7b851fb83 (fix: adding log headers to InputDataResolution modules)
         self.inputData = argumentsDict["InputData"]
         self.configuration = argumentsDict["Configuration"]
         self.jobID = self.configuration.get("JobID")
         # Warning: this contains not only the SEs but also the file metadata
         self.fileCatalogResult = argumentsDict["FileCatalog"]
         # By default put each input data file into a separate directory
         self.inputDataDirectory = argumentsDict.get("InputDataDirectory", "PerFile")
-<<<<<<< HEAD
 
-=======
-
->>>>>>> 7b851fb83 (fix: adding log headers to InputDataResolution modules)
         self.log = gLogger.getSubLogger(f"[{self.jobID}]{self.__class__.__name__}")
         self.log.showHeaders(True)