From b85856266fcc12a129b5a45d15a9901ad9cab34b Mon Sep 17 00:00:00 2001
From: Evan Richardson <evan@mira-a.home>
Date: Fri, 10 May 2019 13:44:35 -0700
Subject: [PATCH] fix merge error

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de4b5b8..9ae2e71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,3 @@ build:
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
-<<<<<<< HEAD
-
-=======
->>>>>>> c80658da6110e2c9095cdbd249c5583509c16a7a