diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 0185e3cb..7d7138f3 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -104,7 +104,6 @@ navigateBack(this, navigateBackScenario) " @forwardClicked="forwardButtonAction" /> - >>>>>>> develop