Skip to content

Commit f375994

Browse files
feat : resolving conflic in intro
1 parent fb30036 commit f375994

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

package.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,10 @@
1313
"aos": "^2.3.4",
1414
"dotenv": "^16.4.5",
1515
"font-awesome": "^4.7.0",
16-
<<<<<<< HEAD
17-
<<<<<<< HEAD
18-
=======
19-
>>>>>>> 23780bd4cd34ed62b195f3991b3f25c2661fed79
2016
"fullpage.js": "^4.0.30",
2117
"i": "^0.3.7",
2218
"jquery": "^3.7.1",
23-
<<<<<<< HEAD
24-
=======
2519
"i": "^0.3.7",
26-
>>>>>>> 88f5bfa2f329e147e1307c0e42c5a7f0f40e0cac
27-
=======
28-
>>>>>>> 23780bd4cd34ed62b195f3991b3f25c2661fed79
2920
"pinia": "^2.2.6",
3021
"typed.js": "^2.1.0",
3122
"vue": "^3.5.12",

0 commit comments

Comments
 (0)