From 4d8eb543f877eae8dc2519ffe52d8c455294886d Mon Sep 17 00:00:00 2001
From: karthik <kskarthik@gitlab.io>
Date: Thu, 26 Dec 2019 15:44:27 +0530
Subject: test ci

---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 341b348..67b7b9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,11 @@ pages:
   before_script:
     - build.sh
  script:
-<<<<<<< HEAD
+  - git clone https://github.com/gohugoio/hugoBasicExample
+  - cd hugoBasicExample
+  - git submodule add https://gitlab.com/ksksarthik/monopriv themes/monopriv
   - hugo -b https://kskarthik.gitlab.io/monopriv/
  artifacts:
-=======
-  - build.sh
-  artifacts:
->>>>>>> e0205d20aa5eff28434f6ae215619fef6fd65ab2
     paths:
     - public
  only:
-- 
cgit v1.2.3