jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Didn't save address-lookup.vue after fixing merge conflict

Browse source
This commit is contained in:
Leah Schumann 2022-05-10 09:38:13 -04:00
parent 7ffd5121b2
commit 9217a25ec6
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/layouts/address-lookup/address-lookup.vue
View file

@ -1,16 +1,4 @@
<template>
<<<<<<< HEAD
<Form ref="theForm" @submit="onSubmit" @invalid-submit="onInvalidSubmit" v-slot="{ meta }" autocomplete="off">
<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall px-5">
<loadingModal :showCloseButton=false :clickOutCloses=false ref="loadingModal">
<template v-slot:body>
Please wait...
</template>
<template v-slot:subtext>
This process can take up 20 seconds.
</template>
</loadingModal>
=======
<Form
@submit="onSubmit"
@invalid-submit="onInvalidSubmit"
@ -19,7 +7,6 @@
autocomplete="off" >
<div class="page-container-grouped-styles">
<loadingModal ref="loadingModal"/>
>>>>>>> develop
<funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
<vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />