Skip to content

Commit e383477

Browse files
fix : Resolving merge conflict in App.vue
2 parents a642ddb + 83bb0a0 commit e383477

File tree

7 files changed

+287
-82
lines changed

7 files changed

+287
-82
lines changed

package-lock.json

Lines changed: 161 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"dependencies": {
1313
"aos": "^2.3.4",
14+
"axios": "^1.7.7",
1415
"dotenv": "^16.4.5",
1516
"font-awesome": "^4.7.0",
1617
"fullpage.js": "^4.0.30",

src/App.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import MainView from '@/views/MainView.vue'
55
import ChatbotButton from './Component/Chatbot/ChatbotButton.vue'
66
77
8+
89
</script>
910

1011
<template>
1112
<div>
1213
<!-- <HeaderView /> -->
1314
<HeaderView />
1415
<MainView />
15-
<!-- <RecommendationView /> -->
16-
<ChatbotButton />
1716
<FooterView />
1817
</div>
1918
</template>

0 commit comments

Comments
 (0)