From 911e384347e78c84ebd45213e99e3c2754ea6391 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 19 May 2025 10:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/modules/splash/controllers/splash_controller.dart | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/modules/splash/controllers/splash_controller.dart b/lib/modules/splash/controllers/splash_controller.dart
index f03edcf93..80a6bc9db 100644
--- a/lib/modules/splash/controllers/splash_controller.dart
+++ b/lib/modules/splash/controllers/splash_controller.dart
@@ -8,10 +8,7 @@ import '../../../data/models/user_Info.dart';
 import '../../../routes/app_routes.dart';
 import '../../../core/themes/theme_service.dart';
 import '../../../data/services/network/api.dart';
-<<<<<<< HEAD
-=======
 import 'package:amap_service/amap_service.dart';
->>>>>>> e77ef1ff0198bb21316fa0e068b78d34f83b013c
 
 class SplashController extends GetxController {
   final GetStorage _storage = GetStorage();