From e0c6d419854f736305d9054f003891c715439a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Sat, 29 Sep 2018 18:09:15 +0200
Subject: [PATCH] Leftover lines break the admin page

---
 templates/admin.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/templates/admin.php b/templates/admin.php
index 7d2725f..8f05648 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -71,16 +71,6 @@ function print_select_options(
         echo "</option>";
     }
 
-
-#54: Merge develop-14 into develop Conflicts
-Resolved all conflicts
-2 conflicting files
-CHANGELOG.md
-CHANGELOG.md
-admin.php
-templates/admin.php
-templates/admin.php
-Resolved
     echo "</select>";
     echo "</label></div>";
 }