From cdeede1ed68124b059aa5288e6ad55fc8de63d82 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite <adam.caouette@safelite.com>
Date: Tue, 28 Oct 2025 16:05:50 -0400
Subject: [PATCH] CASH-1712: missed save for merge conflict; committing
 conflict resolve

---
 src/layouts/schedule/schedule.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1690d831d..106602bdd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -579,13 +579,8 @@ export default {
             vm.showPricingByDay = false; // Pricing By Day is not used in this version
             vm.preSelectedDate = preSelectedDate;
             vm.appointmentType = appointmentType;
-<<<<<<< HEAD
             vm.setDataOnLoad(
                 resultMap.zipCodeData,
-=======
-            vm.setData(
-                zipCodeData,
->>>>>>> release/2025.11.06
                 resultMap.serviceabilityDetails,
                 pricedMobileFeePart,
                 shopProviderData.data
@@ -1630,7 +1625,6 @@ export default {
             this.updateSelectedProvider();
         },
         updateSelectedProvider(newShopProvider) {
-
             if (newShopProvider) {
                 this.selectedProvider = newShopProvider;
             } else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) {