diff options
| author | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
|---|---|---|
| committer | marudor <marudor@marudor.de> | 2018-02-08 22:57:41 +0100 |
| commit | 71b41847e6247471abb957b5859605d9f92fb77e (patch) | |
| tree | 4b5fa812949a4f91b2ed347d9320c9143633f99a /includes/pages/user_shifts.php | |
| parent | 7af09433def2fda9ec47b12823b16e3392b5f6cf (diff) | |
| parent | 6dbec2e2fb64ad8a2f9ae1c9271a401e097a989f (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/css/theme0.css
# public/css/theme1.css
# public/css/theme2.css
# public/css/theme3.css
# public/css/theme4.css
# public/css/theme5.css
# public/css/theme6.css
Diffstat (limited to 'includes/pages/user_shifts.php')
| -rw-r--r-- | includes/pages/user_shifts.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 81b405b1..f3ffd501 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -332,7 +332,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . ' > ' . $i['name'] . '</label>' . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock')) - . '</div><br />'; + . '</div>'; } $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= implode("\n", $htmlItems); |