From 07cd92c01474293eb6c78ffc19d9f089b2972ffe Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Wed, 28 Aug 2019 08:28:14 +0200
Subject: [PATCH] clarify installation instructions

---
 .gitmodules | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 9e367296..6bbba0db 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,5 @@
 [submodule "theme"]
 	path = theme
-<<<<<<< HEAD
-    url = https://git-r3lab.uni.lu/R3/outreach/theme.git
+	url = https://git-r3lab.uni.lu/R3/outreach/theme.git
 
 
->>>>>>> change url of theme
-- 
GitLab