update

a084b9f7 · jinzhu · 90a47a6e · a084b9f7
Commit a084b9f7 authored Jul 31, 2019 by jinzhu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

local.properties .android/local.properties +2 -7

No files found.
--- a/.android/local.properties
+++ b/.android/local.properties
-<<<<<<< HEAD
-sdk.dir=/Users/gengmei/Library/Android/sdk
-flutter.sdk=/Users/gengmei/Library/Android/sdk/flutter
+sdk.dir=/Users/mac/Library/Android/sdk
+flutter.sdk=/Users/mac/development/flutter
 =======
-sdk.dir=/Users/msh/Library/Android/sdk
-flutter.sdk=/Users/msh/flutter
->>>>>>> temp
 flutter.buildMode=release
 flutter.versionName=1.0.0
 flutter.versionCode=1
\ No newline at end of file