From ae242db2bb30846f3b217b6f43ff5974d047d602 Mon Sep 17 00:00:00 2001
From: Matthieu Boileau <matthieu.boileau@math.unistra.fr>
Date: Tue, 21 Nov 2017 01:43:14 +0100
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 732e9ea..1ec3330 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,4 @@ helloworld:
- shell, specific
script:
- echo "hello, world"
-<<<<<<< HEAD
-<<<<<<< HEAD
- - echo "bonjour, monde"
-=======
->>>>>>> c424feb... Clean .gitlab-ci.yml
- - echo "bonjour, monde"
-=======
->>>>>>> c424feb... Clean .gitlab-ci.yml
- echo "bonjour, monde"
--
GitLab