# Conflicts: # src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue # src/layouts/order-confirmation/add-to-calendar/calendar-modal-question/calendar-modal-question.vue |
||
|---|---|---|
| .. | ||
| payment-page.spec.js | ||
| payment-page.vue | ||
# Conflicts: # src/layouts/order-confirmation/add-to-calendar/add-to-calendar.vue # src/layouts/order-confirmation/add-to-calendar/calendar-modal-question/calendar-modal-question.vue |
||
|---|---|---|
| .. | ||
| payment-page.spec.js | ||
| payment-page.vue | ||