From 4fa2525b0767673e2391f06812e4b7e9a04df017 Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Mon, 31 Aug 2020 16:02:21 -0600
Subject: [PATCH] remove production template
---
.gitlab-ci.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4e443c1..5146e201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,7 @@ variables:
tags:
- mage02
+<<<<<<< HEAD
<<<<<<< HEAD
=======
.production:
@@ -126,6 +127,8 @@ variables:
- production@ghsc/geomag/geomag-algorithms
when: manual
+=======
+>>>>>>> remove production template
.staging:
only:
- master@ghsc/geomag/geomag-algorithms
--
GitLab