add .gitignore

.gitignore

@@ -39,13 +39,11 @@ Icon?
 #*.android/app/src/main/java/com/example/myflutter/
 *..android/app/src/main/java/
 build/
-<<<<<<< HEAD
 .android/
 #.ios/
-=======
 # 暂时忽略不追踪  因为android 要跑起来需要更改很多配置
 #.android/
 *.android/local.properties
 .ios/
->>>>>>> master
+!.ios/Podfile
 .flutter-plugins

.ios/Flutter/Generated.xcconfig

 // This is a generated file; do not edit or check into version control.
 FLUTTER_ROOT=/Users/mac/development/flutter
-FLUTTER_APPLICATION_PATH=/Users/mac/code/gmalpha_flutter
-FLUTTER_TARGET=/Users/mac/code/gmalpha_flutter/lib/main.dart
+FLUTTER_APPLICATION_PATH=/Users/mac/code/GMAlpha/gmalpha_flutter
+FLUTTER_TARGET=/Users/mac/code/GMAlpha/gmalpha_flutter/lib/main.dart
 FLUTTER_BUILD_DIR=build
 SYMROOT=${SOURCE_ROOT}/../build/ios
 FLUTTER_BUILD_NAME=1.0.0