Leftover lines break the admin page

2018-09-29 18:09:15 +02:00
parent 924886dd9a
commit e0c6d41985
1 changed files with 0 additions and 10 deletions
--- 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>";
 }