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