From ef953a87fc0ae516549b701bd2f59d77f2db17d2 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sun, 5 Apr 2020 21:58:50 +0200
Subject: [PATCH] Removing useless conflict
---
src/includes/mentor/dashboard.pug | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 42a5db89..324fd8ab 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -38,17 +38,11 @@ section#home
hidden
i.fas.fa-spinner.fa-spin
-<<<<<<< HEAD
- include resources/detail.pug
-
- h2.title_lead_avenir=`${data.RelatedResources}`
-=======
include resources/comment.pug
include resources/detail.pug
h2.title_form.related=`${data.RelatedResources}`
->>>>>>> 44ede0e17b643c8bf5eb11f00516bfea3ae53618
sib-display(
bind-resources
--
GitLab