diff --git a/open/gcube-5.1.0.yaml b/open/gcube-5.1.0.yaml index 9c69e41..20da3bd 100644 --- 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