Solved conflict gitattributes

.gitattributes

@@ -356,3 +356,4 @@ data/AB/1995/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1990/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1992/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
 data/AB/1993/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text
+data/AB/1994/02_extractedxml.tar.gz filter=lfs diff=lfs merge=lfs -text

.renku/workflow/c2f614e0e3404b07966c88893244e0ea_python.cwl

+arguments: []
+baseCommand:
+- python
+class: CommandLineTool
+cwlVersion: v1.0
+hints: []
+inputs:
+  input_1:
+    default:
+      class: File
+      path: ../../src/python/run_extract_origxml.py
+    inputBinding:
+      position: 1
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: File
+  input_2:
+    default:
+      class: File
+      path: ../../data/AB/1994/00_rawpdfs.tar.gz
+    inputBinding:
+      position: 2
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: File
+  input_3:
+    default: data/AB/1994/02_extractedxml.tar.gz
+    inputBinding:
+      position: 3
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: string
+outputs:
+  output_0:
+    outputBinding:
+      glob: $(inputs.input_3)
+    streamable: false
+    type: File
+permanentFailCodes: []
+requirements:
+- class: InlineJavascriptRequirement
+- class: InitialWorkDirRequirement
+  listing:
+  - entry: '$({"listing": [], "class": "Directory"})'
+    entryname: data/AB/1994
+    writable: true
+successCodes: []
+temporaryFailCodes: []