diff options
Diffstat (limited to 'include/datetime.php')
| -rw-r--r-- | include/datetime.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/datetime.php b/include/datetime.php index 952151a00..1d10e7ad7 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -235,11 +235,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke $o .= replace_macros($tpl,array( '$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'), )); -<<<<<<< HEAD - $o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>"; -======= $o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:15,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>"; ->>>>>>> upstream/master return $o; } |