From 48d576ef972e234386587ca9a92233ed0e33050d Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Fri, 28 Feb 2020 00:17:25 +0100
Subject: [PATCH] rebasing continues [wip]

---
 .drone.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 3b63007..6fa4076 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -65,6 +65,7 @@ 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
@@ -113,3 +114,11 @@ 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