Resolve merge conflict between main and vypq

2025-04-14 11:41:00 +07:00
parent 758cc22a0f d5b323e158
commit 6af1baed32
64 changed files with 1001 additions and 237 deletions
--- a/lib/feature/map/widget/show_nearest_place.dart
+++ b/lib/feature/map/widget/show_nearest_place.dart
@@ -52,6 +52,7 @@ showNearPlacesSideSheet(
        padding: context.paddingLow,
        width: screenWidth,
        height: screenHeight / 3,
+        color: Colors.white,
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [