Skip to content

Commit caa1b0d

Browse files
fix(home): wrong merge 🐛
1 parent 4293534 commit caa1b0d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/modules/home/components/home.banner.component.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
class="align-self-end"
6969
fab
7070
outlined
71-
@click="$vuetify.goTo('#downloads')"
71+
@click="$vuetify.goTo('#about-me')"
7272
data-aos="fade-up"
7373
>
7474
<v-icon>fa-angle-down</v-icon>

src/modules/home/router/home.router.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import config from '@/config';
55
import home from '@/modules/home/views/home.view.vue';
66
import pages from '@/modules/home/views/pages.view.vue';
7+
import team from '@/modules/home/views/team.view.vue';
78

89
/**
910
* Router configuration
@@ -28,7 +29,6 @@ export default [
2829
},
2930
},
3031
{
31-
<<<<<<< Updated upstream
3232
path: '/team',
3333
name: 'Team',
3434
component: team,
@@ -47,8 +47,6 @@ export default [
4747
},
4848
},
4949
{
50-
=======
51-
>>>>>>> Stashed changes
5250
path: '*',
5351
redirect: { name: 'Home' },
5452
meta: {

0 commit comments

Comments
 (0)