fix conflict with master

2021-03-12 11:00:57 +01:00 · 2021-03-12 11:00:57 +01:00 · 18d5a95a56
parent c64b560a55
commit 18d5a95a56
1 changed files with 0 additions and 3 deletions
--- a/open/gcube-5.1.0.yaml
+++ b/open/gcube-5.1.0.yaml
@ -15,11 +15,8 @@ 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