Fix broken merge

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,