Skip to content
Snippets Groups Projects
Commit 8cef95cc authored by Matthieu Boileau's avatar Matthieu Boileau
Browse files

Update .gitlab-ci.yml

parent a834ed6a
No related merge requests found
Pipeline #8454 failed
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
.gitlab-ci.yml
+ 4
− 0
View file @ 8cef95cc
...@@ -4,6 +4,10 @@ helloworld: ...@@ -4,6 +4,10 @@ helloworld:
script: script:
- echo "hello, world" - echo "hello, world"
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
- echo "bonjour, monde"
=======
>>>>>>> c424feb... Clean .gitlab-ci.yml
- echo "bonjour, monde" - echo "bonjour, monde"
======= =======
>>>>>>> c424feb... Clean .gitlab-ci.yml >>>>>>> c424feb... Clean .gitlab-ci.yml
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment