diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3a738b..c7ebef5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,10 @@ before_script: include: - local: 'ci_templates/.cic-template.yml' - local: 'apps/contract-migration/.gitlab-ci.yml' +<<<<<<< HEAD +======= + # - local: 'apps/cic-eth/.gitlab-ci.yml' +>>>>>>> 5c94278338462550fd682251b173ea956836085b stages: - build