From 4e4c16e382d21a6845f75dd4640b4c47356937ac Mon Sep 17 00:00:00 2001
From: Kirill Schmidt <kirill.schmidt@teckids.org>
Date: Fri, 9 Oct 2020 19:50:02 +0200
Subject: [PATCH] Fix Merge Conflict

---
 pelicanconf.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pelicanconf.py b/pelicanconf.py
index ff2dc2c..a6bd6d0 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -45,10 +45,6 @@ MENUITEMS = [
         ('Online-Unterricht', '/pages/bigbluebutton.html'),
         ('Lernmanagementsystem', '/pages/lms.html'),
         ('Tools für Hackathons', '/pages/hackathon.html'),
-        ]),
-    ('Projekt', [
-        ('Mitmachen', '/pages/contribute.html'),
-        
         ]),
     ('Projekt', [
         ('Mitmachen', '/pages/contribute.html'),
-- 
GitLab