forked from gCubeCI/gCubeReleases
fix conflict with master
This commit is contained in:
parent
c64b560a55
commit
18d5a95a56
|
@ -15,11 +15,8 @@ gCube_release:
|
||||||
Services:
|
Services:
|
||||||
- name: gcat
|
- name: gcat
|
||||||
version: 1.4.5
|
version: 1.4.5
|
||||||
<<<<<<< HEAD
|
|
||||||
- name: storagehub
|
- name: storagehub
|
||||||
version: 1.2.5
|
version: 1.2.5
|
||||||
=======
|
|
||||||
>>>>>>> branch 'master' of https://code-repo.d4science.org/gCubeCI/gCubeReleases.git
|
|
||||||
|
|
||||||
Portlets:
|
Portlets:
|
||||||
- name: gcube-ckan-datacatalog
|
- name: gcube-ckan-datacatalog
|
||||||
|
|
Loading…
Reference in New Issue