Update .gitlab-ci.yml

8cef95cc · Matthieu Boileau · a834ed6a · 8cef95cc
Commit 8cef95cc authored 7 years ago by Matthieu Boileau
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,10 @@ helloworld:
  script:
    - echo "hello, world"
 <<<<<<< HEAD
+<<<<<<< HEAD
+    - echo "bonjour, monde"
+=======
+>>>>>>> c424feb... Clean .gitlab-ci.yml
    - echo "bonjour, monde"
 =======
 >>>>>>> c424feb... Clean .gitlab-ci.yml