From 9ce7daf0dd31e9239c3b0588d3aee78c171acba7 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Sun, 20 Mar 2022 12:38:01 +0100
Subject: [PATCH] Fix broken merge
---
javascript/src/Main.js | 6 ------
1 file changed, 6 deletions(-)
diff --git a/javascript/src/Main.js b/javascript/src/Main.js
index 01e10cfa8..b13815212 100644
--- a/javascript/src/Main.js
+++ b/javascript/src/Main.js
@@ -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,
--
GitLab