From 663468fe1e06b693cbf562296fd39e2f9bf8089c Mon Sep 17 00:00:00 2001
From: Dominik Gerstorfer <dominik.gerstorfer@gmail.com>
Date: Wed, 19 May 2021 11:43:30 +0200
Subject: [PATCH] Changed config

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

diff --git a/config.yml b/config.yml
index da396cb..c304405 100644
--- a/config.yml
+++ b/config.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 baseURL: "https://gerstorfer.gitlab.io/myproject/"
-=======
-baseURL: https://gerstorfer.gitlab.io/myproject/
 languageCode: en-us
->>>>>>> a9d719972840bb823598917f60efa42c71732aa7
 theme: "PaperMod"
 title: My New Hugo Site
-- 
GitLab