Commit df4ac82e authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fix broken merge

parent 2bf2998e
Pipeline #6965 passed with stage
in 1 minute and 52 seconds
......@@ -149,8 +149,6 @@ $(document).ready( function () {
calendarWeeks: ($(this).data("show-calendar-weeks") !== undefined) ? $(this).data("show-calendar-weeks") : false,
useCurrent: ($(this).data("use-current-datetime") !== undefined) ? $(this).data("use-current-datetime") : false,
sideBySide: ($(this).data("datetime-side-by-side") !== undefined) ? $(this).data("datetime-side-by-side") : false,
minDate: dates.minDate,
maxDate: dates.maxDate
};
var currentDatePicker = $(this).datetimepicker(options);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment