From 9cd88a726d57a19442d43208748702aab39460c2 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Mon, 20 Jun 2022 14:56:26 +0200
Subject: [PATCH] fix conflict
---
views/DE/project/mailinglists.pug | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/views/DE/project/mailinglists.pug b/views/DE/project/mailinglists.pug
index a5ab964..66d64e1 100644
--- a/views/DE/project/mailinglists.pug
+++ b/views/DE/project/mailinglists.pug
@@ -21,23 +21,6 @@ html(lang="de")
div(class="col-md-12 margin_bottom_30")
h2(class="text-center color_708090") <strong>Aktive Mailinglisten</strong>
div(class="table-responsive table-borderless")
-<<<<<<< HEAD
- table(class="table table-striped table-bordered table-hover")
- thead()
- tr()
- th Name
- th Zum Abonnement der Mailingliste
- th Zum zugehörigen Projekt
- th Keywords
- tbody()
- for item in mailinglists
- if item.projectstatus == '1'
- tr
- td #{item.name}
- td <a href="#{item.src}">#{item.src}</a>
- td <a href='projectoverview?projectID=#{item.id}'>#{item.project_title}</a>
- td #{item.keywords}
-=======
if !mailinglists
p There is no active mailing list at the moment
else
@@ -56,7 +39,6 @@ html(lang="de")
td <a href="#{item.src}">#{item.src}</a>
td <a href='projectoverview?projectID=#{item.id}'>#{item.project_title}</a>
td #{item.keywords}
->>>>>>> testing
div(id="aboText" class="mailingList_aboText")
div(class="container")
div(class="row m_bottom_0 p_top_20 p_bottom_20")
--
GitLab