fix conflicts

lib/main.dart

 import 'package:flutter/material.dart';
-<<<<<<< HEAD
+import 'testPage/battery.dart';
+import 'testPage/assetsChannel.dart';
+import 'testPage/layoutTest.dart';
+import 'testPage/animationTest.dart';
+import 'testPage/netWorkTest.dart';
 import 'hybrid_stack/hybrid_stack_manager_plugin.dart';
 import 'app_config.dart';
 import 'my_app.dart';
@@ -21,14 +25,8 @@ void main() async {
         url: args["url"], query: args["query"], params: args["params"]);
     Router.sharedInstance().pushPageWithOptionsFromFlutter(
         routeOption: routeOption, animated: false);
-=======
-import 'testPage/battery.dart';
-import 'testPage/assetsChannel.dart';
-import 'testPage/layoutTest.dart';
-import 'testPage/animationTest.dart';
-import 'testPage/netWorkTest.dart';
-
-void main() => runApp(MyApp());
+  }
+}
 
 class MyApp extends StatelessWidget {
   @override
@@ -55,7 +53,6 @@ class MyApp extends StatelessWidget {
 
   Widget assetsChannelPage(BuildContext context) {
     return AssestPlatformChannel();
->>>>>>> ouxiang_dev
   }
 
   Widget layoutTestPage(BuildContext context) {

lib/services/ALServers.dart

@@ -26,11 +26,7 @@ class ALServers {
   static const String API_ACCOUNT_REGISTER = '/api/account/register';// 用户注册
   static const String API_ACCOUNT_GETVFC = '/api/account/get_vfc';// 获取验证码
   static const String API_ACCOUNT_THIRDPART = '/api/account/thirdparty_login'; // 三方账户登录
-<<<<<<< HEAD
   static const String API_ACCOUNT_SUGGESTION = "/api/v1/suggestion"; // 意见与建议
-
-=======
->>>>>>> ouxiang_dev
   // HOST
 }
 // HOST