conflict changes

dharanidharandharmasivam · dharanidharandharmasivam · commit 56267476d840 · 2020-03-19T16:28:17.000+05:30
# Conflicts:
#	android/local.properties
#	ios/Runner/GeneratedPluginRegistrant.m
#	lib/sample_browser.dart
#	pubspec.yaml
diff --git a/android/local.properties b/android/local.properties
@@ -1,4 +1,4 @@
-sdk.dir=C:\\Users\\Nandhini\\AppData\\Local\\Android\\sdk
-flutter.sdk=D:\\flutter\\flutter
+sdk.dir=C:\\Users\\DharanitharanPalanis\\AppData\\Local\\Android\\sdk
+flutter.sdk=C:\\src\\flutter
 flutter.buildMode=debug
 flutter.versionName=17.4.39
