diff --git a/src/routes.js b/src/routes.js
index 158b1c9..a770734 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -2,11 +2,7 @@ import Vue from 'vue'
import VueRouter from 'vue-router'
import Home from './view/Home.vue'
-<<<<<<< HEAD
import PersonalData from './view/PersonalData.vue'
-=======
-import Cart from './view/Cart.vue'
->>>>>>> origin
const routes = [
{
@@ -20,15 +16,9 @@ const routes = [
name: 'home'
},
{
-<<<<<<< HEAD
path: '/datosPersonales',
component: PersonalData,
name: 'personalData'
-=======
- path: '/cart',
- component: Cart,
- name: 'cart'
->>>>>>> origin
}
]
diff --git a/src/view/Home.vue b/src/view/Home.vue
index 28106e5..41f2cd3 100644
--- a/src/view/Home.vue
+++ b/src/view/Home.vue
@@ -1,21 +1,23 @@