Merge branch 'master' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into develop

# Conflicts:
#	src/.dart_tool/package_config.json

src/.dart_tool/package_config.json

@@ -164,7 +164,23 @@
       "languageVersion": "3.1"
     }
   ],
+<<<<<<< HEAD
   "generated": "2023-10-24T12:01:20.923476Z",
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+  "generated": "2023-10-16T01:46:48.339173Z",
+=======
+<<<<<<< HEAD
+  "generated": "2023-10-16T01:37:37.659867Z",
+=======
+  "generated": "2023-10-14T16:04:33.747467Z",
+>>>>>>> 99f10a789f1d8550634d678f64e6e5e48b4a346d
+>>>>>>> 76a87407b46a1483a7bab52f8315f6937e30bc7f
+=======
+  "generated": "2023-10-16T02:07:01.224187Z",
+>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
+>>>>>>> de423840f81ecfe8842e778255c7b2d277887a46
   "generator": "pub",
   "generatorVersion": "3.1.1"
 }