diff --git a/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php index edc76d2c..fc49925f 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php @@ -122,5 +122,6 @@ class MergeBookingLogic extends AbstractControllerLogic } catch (\Exception $exception) { throw new ErrorException($exception->getMessage(), $exception->getCode()); } + } } \ No newline at end of file diff --git a/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue b/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue index 05ff0701..05bd5f72 100644 --- a/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue +++ b/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue @@ -1,6 +1,7 @@