Merge branch 'master' of github.com:mmcc007/modal_progress_hud

mmcc007 · mmcc007 · commit f87f428f5d58 · 2018-10-21T11:35:49.000-07:00
# Conflicts:
#	example/pubspec.lock
#	lib/modal_progress_hud.dart
#	scripts/runTests.sh
#	test/modal_progress_hud_test.dart
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -77,7 +77,11 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
+<<<<<<< HEAD
     version: "5.0.1"
+=======
+    version: "5.0.6"
+>>>>>>> aa6bb1b642020a8e28c5eefd3909722e80f79973
   flutter:
     dependency: "direct main"
     description: flutter
diff --git a/test/modal_progress_hud_test.dart b/test/modal_progress_hud_test.dart
@@ -1,4 +1,3 @@
-//import 'package:test/test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-//import 'package:test/test.dart';`
`2`	`1`	`import 'package:flutter/material.dart';`
`3`	`2`	`import 'package:flutter/widgets.dart';`
`4`	`3`	`import 'package:flutter_test/flutter_test.dart';`