From 0de889b0c5447cc33336147455e5f37a99ebea67 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Mon, 6 Jan 2020 15:54:53 +0100
Subject: [PATCH] Remove merge conflict artifact

---
 .drone.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 83df60dc..efdf2cb3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,18 +3,10 @@ name: default
 
 steps:
   - name: build
-<<<<<<< HEAD
     image: hugo
     commands:
       - wget https://github.com/gohugoio/hugo/releases/download/v0.62.1/hugo_0.62.1_Linux-64bit.deb -O hugo.deb
       - dpkg -i hugo.deb
-=======
-    image: ruby
-    commands:
-      - gem install bundler
-      - bundle install
-      - bundle exec jekyll build
->>>>>>> upstream/master
   
   - name: docker
     image: plugins/docker