fix merge conflict

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App.vue

@@ -339,10 +339,6 @@ export default {
       }).then((_r) => {
         this.resetCalendar();
       })
-    },
-    onEventDropOrResize(payload) {
-      payload.event.setProp('borderColor', '#3788d8');
-      payload.event.setProp('backgroundColor', '#fffadf');
       payload.event.setProp('textColor', '#444444');
 
       patchCalendarRange(payload.event.extendedProps.calendarRangeId,
@@ -375,22 +371,20 @@ export default {
         deleteCalendarRange(payload.extendedProps.calendarRangeId).then(() => {
           this.resetCalendar();
         })
-      } else {
+        // console.log(this.myCalendarClickedEvent)
-        let newEvents = this.calendarEvents.new.events;
+        this.openModal();
-        let filterEvents = newEvents.filter((e) =>
-          e.start !== payload.startStr && e.end !== payload.endStr
-        );
-        this.calendarEvents.new = {
-          events: filterEvents,
-          color: "#3788d8"
-        };
-
-        // this.$store.dispatch('removeNewCalendarRanges', payload);
-
-        this.updateEventsSource();
       }
-
     },
+    // onClickSave(payload) {
+    //   this.flag.loading = true;
+    //     Promise.all(this.$store.state.newCalendarRanges.map(cr => {
+    //         postCalendarRange({
+    //           user: {
+    //               type: 'user',
+    //               id: window.userId,
+    //           },
+    //           startDate: {
+    //               datetime: `${cr.start.toISOString().split('.')[0]}+0000`, //should be like "2021-08-20T15:00:00+0200",
     isSameDay(date1, date2) {
       return date1.getFullYear() === date2.getFullYear() &&
           date1.getMonth() === date2.getMonth() &&