build merge
This commit is contained in:
commit
99665014ed
@ -7,6 +7,10 @@ before_script:
|
|||||||
include:
|
include:
|
||||||
- local: 'ci_templates/.cic-template.yml'
|
- local: 'ci_templates/.cic-template.yml'
|
||||||
- local: 'apps/contract-migration/.gitlab-ci.yml'
|
- local: 'apps/contract-migration/.gitlab-ci.yml'
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
# - local: 'apps/cic-eth/.gitlab-ci.yml'
|
||||||
|
>>>>>>> 5c94278338462550fd682251b173ea956836085b
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
Loading…
Reference in New Issue
Block a user