Merge branches 'develop' and 'master' of https://github.com/phillwiggins/flutter_parse_sdk

phillwiggins · phillwiggins · commit 311e25e63ac4 · 2019-02-16T07:33:43.000Z
# Conflicts:
#	.idea/libraries/Dart_Packages.xml
#	lib/src/objects/parse_file.dart
#	lib/src/objects/parse_user.dart
#	pubspec.yaml
diff --git a/test/parse_client_configuration_test.dart b/test/parse_client_configuration_test.dart
@@ -1,4 +1,4 @@
-import 'package:parse_server_sdk/parse.dart';
+import 'package:parse_server_sdk/parse_server_sdk.dart';
 import 'package:test/test.dart';
 
 void main() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:parse_server_sdk/parse.dart';`
	`1`	`+import 'package:parse_server_sdk/parse_server_sdk.dart';`
`2`	`2`	`import 'package:test/test.dart';`
`3`	`3`
`4`	`4`	`void main() {`