From a4224dca6adf19395943a5e8a9bbe9865488241f Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Sun, 6 Mar 2022 12:51:39 +0000
Subject: [PATCH] fix merge conflicts again........

---
 fet2020/templates/home.html                               | 2 +-
 fet2020/templates/posts/partials/_posts_hero_compact.html | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 0cf591ff..b784d96d 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -91,7 +91,7 @@
 				</span>
 				<i class="fab fa-discord text-4xl"></i> 
 			</div>
-			<a href="https://discord.fet.at/" class="flex-1">
+			<a href="{% url 'discord' %}" class="flex-1">
 				FET Discord-Server<br>
 				<span class="hidden lg:inline text-sm text-gray-300 dark:text-gray-400">Du hast Fragen zum Studium oder möchtest dich einfach mich anderen Studierenden austauschen? </span><span class="text-sm text-gray-300 dark:text-gray-400">Klicke hier zum Beitreten <span class="hidden sm:inline"><i class="far fa-angle-right"></i></span></span>
 			</a>
diff --git a/fet2020/templates/posts/partials/_posts_hero_compact.html b/fet2020/templates/posts/partials/_posts_hero_compact.html
index 42cfab19..b6030756 100644
--- a/fet2020/templates/posts/partials/_posts_hero_compact.html
+++ b/fet2020/templates/posts/partials/_posts_hero_compact.html
@@ -2,7 +2,11 @@
     <a href="{{ post.url }}" class="block p-4">
         <div class="float-right px-2 py-0.5 rounded-full text-sm font-medium text-proprietary dark:text-blue-100 bg-blue-200 dark:bg-proprietary-dark">
             <i class="fa-solid fa-calendar-days mr-1"></i>
+<<<<<<< HEAD
             <p style="margin-bottom: 0rem;">{{ post.date|date:"d. F Y" }}</p>
+=======
+            <p>{{ post.date|date:"d. F Y" }}</p>
+>>>>>>> fix merge conflicts again........
         </div>
         <h3 class="text-gray-800 dark:text-gray-200 leading-relaxed">{{ post.title|safe|truncatechars:60 }}</h3>
     </a>