remove merge conflict from pubspec

klanmiko · web-flow · commit 92bd3333a6af · 2019-02-02T12:26:32.000-08:00
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -17,9 +17,5 @@ dependencies:
 
   # Utils
   shared_preferences: ^0.4.3
-<<<<<<< HEAD
   path_provider: ^0.4.1
   uuid: ^1.0.0
-=======
-  path_provider: ^0.4.1
->>>>>>> 9c70784113c26313035f15b424361bdd30362abe
