@@ -39,11 +39,8 @@ dependencies:
dio: ^4.0.6
flutter_screenutil: ^5.3.1
get_storage: ^2.0.3
-<<<<<<< HEAD
fluttertoast: ^8.0.9
-=======
location: ^4.3.0
->>>>>>> aab895cc95471d4dfd7cb90d05a35ccceb52c4e0
dev_dependencies:
flutter_test: