find_skymodel_cal bugfixes

Former-commit-id: e233edc9 [formerly 58858c57]
Former-commit-id: 349daa6a
Former-commit-id: 03b86f15

steps/blsmooth.cwl

@@ -82,7 +82,7 @@ outputs:
       glob: $(inputs.msin.basename)
 hints:
  - class: DockerRequirement
-   dockerPull: lofareosc/prefactor:HBAcalibrator-ci:master
+   dockerPull: lofareosc/prefactor:HBAcalibrator
 requirements:
  - class: InitialWorkDirRequirement
    listing:

steps/find_skymodel_cal.cwl

@@ -12,14 +12,10 @@ inputs:
       inputBinding:
         position: 0
     - id: skymodels
-<<<<<<< HEAD
       type:
         - Directory?
         - File?
-=======
-      type: Directory?
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
-      doc: Directory containing the sky models
+      doc: Directory or file containing the sky models
     - id: skymodels_extension
       type: string?
       doc: path extension of the sky models
@@ -81,8 +77,4 @@ requirements:
 
 hints:
   DockerRequirement:
-<<<<<<< HEAD
-    dockerPull: lofareosc/prefactor:latest
-=======
-    dockerPull: lofareosc/prefactor-ci:master
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
+    dockerPull: lofareosc/prefactor:HBAcalibrator