From 79e780e511f1e68f70e099dde3358d16562cca90 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@icloud.com>
Date: Wed, 18 Aug 2021 09:44:34 -0400
Subject: [PATCH] chore(): resolve merge conflict with vue test app

---
 packages/vue/test-app/tests/e2e/specs/routing.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/vue/test-app/tests/e2e/specs/routing.js b/packages/vue/test-app/tests/e2e/specs/routing.js
index 8b4a250e16..ddab932c77 100644
--- a/packages/vue/test-app/tests/e2e/specs/routing.js
+++ b/packages/vue/test-app/tests/e2e/specs/routing.js
@@ -192,7 +192,6 @@ describe('Routing', () => {
     cy.ionBackButtonHidden('home');
   });
 
-<<<<<<< HEAD
   // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22662
   it('should push a new instance of a parameterized page so there is a transition', () => {
     cy.visit('http://localhost:8080');
@@ -209,7 +208,8 @@ describe('Routing', () => {
 
     cy.ionPageVisible('routingparameter-123')
     cy.ionPageDoesNotExist('routingparameter-456');
-=======
+  });
+
   it('should select correct view when using router.go()', () => {
     cy.visit('http://localhost:8080');
 
@@ -333,7 +333,6 @@ describe('Routing', () => {
     cy.ionPageVisible('home');
     cy.ionPageDoesNotExist('routing');
     cy.ionPageDoesNotExist('routingparameter');
->>>>>>> origin/main
   })
 });