Update pubspec.lock

Sub6Resources · Sub6Resources · commit 2a6e7682ac40 · 2019-12-14T15:37:54.000-07:00
diff --git a/pubspec.lock b/pubspec.lock
@@ -130,24 +130,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
-<<<<<<< HEAD
   open_iconic_flutter:
     dependency: transitive
     description:
       name: open_iconic_flutter
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
-=======
->>>>>>> master
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.4"
-<<<<<<< HEAD
   path_drawing:
     dependency: transitive
     description:
@@ -162,8 +158,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.4"
-=======
->>>>>>> master
   pedantic:
     dependency: transitive
     description:
@@ -185,16 +179,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
-<<<<<<< HEAD
   screen:
     dependency: transitive
     description:
       name: screen
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.5"
-=======
->>>>>>> master
   sky_engine:
     dependency: transitive
     description: flutter
@@ -256,7 +247,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
-<<<<<<< HEAD
   video_player:
     dependency: "direct main"
     description:
@@ -271,8 +261,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.14+1"
-=======
->>>>>>> master
   xml:
     dependency: transitive
     description:
@@ -282,8 +270,4 @@ packages:
     version: "3.5.0"
 sdks:
   dart: ">=2.4.0 <3.0.0"
-<<<<<<< HEAD
   flutter: ">=1.7.4 <2.0.0"
-=======
-  flutter: ">=0.5.0"
->>>>>>> master
