build merge

2021-01-31 17:10:17 -08:00 · 2021-01-31 17:10:17 -08:00 · 99665014ed
parent 7451042b4b 5c94278338
commit 99665014ed
1 changed files with 4 additions and 0 deletions
--- 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