From 18d5a95a56c3672181bb9a38ed03ab433f88cd9b Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Fri, 12 Mar 2021 11:00:57 +0100
Subject: [PATCH] fix conflict with master

---
 open/gcube-5.1.0.yaml | 3 ---
 1 file changed, 3 deletions(-)

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