solved conflicts

RohanDarade · RohanDarade · commit 3e6b680ae5e7 · 2023-04-08T15:20:18.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "@emotion/styled": "^11.10.6",
     "@mui/material": "^5.11.15",
     "@mui/x-date-pickers": "^6.0.4",
+    "aos": "^2.3.4",
     "axios": "^1.3.5",
     "cheerio": "^1.0.0-rc.12",
     "firebase": "^9.19.1",
diff --git a/src/pages/landing.jsx b/src/pages/landing.jsx
@@ -160,3 +160,5 @@ const Landing = () => {
 };
 
 export default Landing;
+
+

-Original file line number
+Diff line change
 };
 export default Landing;
++
++