diff options
| author | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2018-08-16 21:36:12 +0300 |
|---|---|---|
| committer | Marcin Łojewski <marcin.lojewski@mlojewski.me> | 2018-08-16 21:36:12 +0300 |
| commit | aba409b24da7acd444ca25e319e8274ba3e94416 (patch) | |
| tree | 51ffccf2e7fcca64c623310c3fb0787389bf0608 /templates | |
| parent | 880416a6fbf42cd56f4552214ada2a09283d99f6 (diff) | |
Leftover lines break the admin page
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/admin.php | 10 |
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>"; } |