Merge branch 'master' of

https://code-repo.d4science.org/gCubeCI/gCubeReleases.git Conflicts: open/gcube-5.1.0.yaml
2021-03-12 11:00:05 +01:00 · 2021-03-12 11:00:05 +01:00 · c64b560a55
parent f04bb720eb 51094c9cb6
commit c64b560a55
1 changed files with 3 additions and 0 deletions
--- a/open/gcube-5.1.0.yaml
+++ b/open/gcube-5.1.0.yaml
@ -15,8 +15,11 @@ gCube_release:
     Services:
       - name: gcat
         version: 1.4.5
+<<<<<<< HEAD
       - name: storagehub
         version: 1.2.5  
+=======
+>>>>>>> branch 'master' of https://code-repo.d4science.org/gCubeCI/gCubeReleases.git
         
     Portlets:
       - name: gcube-ckan-datacatalog