Commit 9ce7daf0 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fix broken merge

parent 5278c900
Pipeline #6964 passed with stage
in 1 minute and 50 seconds
......@@ -139,13 +139,7 @@ $(document).ready( function () {
}
var options = {
locale: $(this).data("locale") || "en",
<<<<<<< HEAD
daysOfWeekDisabled: $(this).data("days-of-week-disabled") || [],
minDate: dates.minDate,
maxDate: dates.maxDate,
=======
daysOfWeekDisabled: $(this).data("days-of-week-disabled") || [0,6],
>>>>>>> 4ef648410fa05207a97751883863efa69d717879
format: $(this).data("format") || "DD.MM.YYYY HH:mm",
viewMode: $(this).data("view-mode-default") || "days",
showClear: ($(this).data("show-clear-button") !== undefined) ? $(this).data("show-clear-button") : true,
......
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