From 5819894285358aeec7f3d6ec64df0268a90777c8 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Fri, 28 Feb 2020 01:07:05 +0100
Subject: [PATCH] removed volatile files reflected it in .drone.yml

* as per e7fc2758d3
* also, we now need git for submodule initiation apparently
---
 .drone.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 6fa4076..3b63007 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -65,7 +65,6 @@ steps:
     OL_D:
       from_secret: hugo_dir
   commands:
-<<<<<<< HEAD
   - echo $OL_P > nupass
   - export RSYNC_RSH='sshpass -f ./nupass ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
   - rsync -av --delete --chown $OL public/ $OL@dotya.ml:$OL_D-test
@@ -114,11 +113,3 @@ steps:
         from_secret: discord_webhook_id
       webhook_token:
         from_secret: discord_webhook_token
-=======
-    - pacman -Syu --noconfirm wget tar
-    - wget https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.tar.gz -O hugo.tgz
-    - tar xfv hugo.tgz
-    - git submodule init
-    - git submodule update
-    - ./hugo --gc=true
->>>>>>> 75ffadc... [skip ci] add submodule in hugo-extended build too