From a1f5b2c3314c4a4fec7c827dcb72da48a2405b2d Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Wed, 13 Nov 2019 12:33:38 +0100
Subject: [PATCH] forgotten file
---
src/includes/mentor/components/header.pug | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 363919fb..b9f62c26 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -16,10 +16,6 @@
label-languages=''
naked
)
-<<<<<<< HEAD
-=======
-
->>>>>>> language selector works.
.dropdownWrapper
sib-display#mentor-account-picture.dropdownLabel(
bind-user
--
GitLab