1 files changed, 0 insertions, 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>";
 }