From 8cef95ccbc19283bd71501b10e6e344f2efdc118 Mon Sep 17 00:00:00 2001
From: Matthieu Boileau <matthieu.boileau@math.unistra.fr>
Date: Tue, 21 Nov 2017 01:33:27 +0100
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c22b97..732e9ea 100644
--- 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
--
GitLab