merge fix confilct

830659cf · ouxiang · c2c0ba09 · 20081b34 · 830659cf
Commit 830659cf authored Feb 20, 2019 by ouxiang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

assetsChannel.dart lib/assetsChannel.dart +0 -1

No files found.
--- a/lib/assetsChannel.dart
+++ b/lib/assetsChannel.dart
@@ -86,7 +86,6 @@ class _AssestPlatformChannelState extends State<AssestPlatformChannel> {
  Widget _imageWidget(){
    if (_imageData != null) {
      return Image.memory(_imageData,
-                      // color: Colors.purple,
                      width: 200,
                      height: 200,
                    );