From 00b40025eba69c513d29ffcbf6625a2af7352388 Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Mon, 26 Mar 2018 19:45:53 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b418e2b..2cfe47b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,6 @@
stages:
- build
-<<<<<<< HEAD
- test
-=======
- - test:scripts
- - test:monitoring
- - test:inputs
->>>>>>> 7b4334bb2ab788e29ddde9098efcba96c0447112
build:tests:
stage: build
--
GitLab