解决冲突代码

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();