Skip to content
Snippets Groups Projects
Commit 4e4c16e3 authored by Kirill Schmidt's avatar Kirill Schmidt
Browse files

Fix Merge Conflict

parent 7c8dc2bd
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
pelicanconf.py
+ 0
− 4
View file @ 4e4c16e3
...@@ -45,10 +45,6 @@ MENUITEMS = [ ...@@ -45,10 +45,6 @@ MENUITEMS = [
('Online-Unterricht', '/pages/bigbluebutton.html'), ('Online-Unterricht', '/pages/bigbluebutton.html'),
('Lernmanagementsystem', '/pages/lms.html'), ('Lernmanagementsystem', '/pages/lms.html'),
('Tools für Hackathons', '/pages/hackathon.html'), ('Tools für Hackathons', '/pages/hackathon.html'),
]),
('Projekt', [
('Mitmachen', '/pages/contribute.html'),
]), ]),
('Projekt', [ ('Projekt', [
('Mitmachen', '/pages/contribute.html'), ('Mitmachen', '/pages/contribute.html'),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment