commit 074b8d434cbd85022689cb07a5a07e24419dc17c
author Francisco Magdaleno Arceo <franciscojma@google.com> Mon Mar 02 12:15:01 2020 -0800
committer Francisco Magdaleno Arceo <franciscojma@google.com> Mon Mar 02 12:15:01 2020 -0800
tree fd288c49d11908acd9a31fb373382e8a9fda68b1
parent d03024ef3ec0227c5226f622041ca86be6c0d6c1

Missing files

packages/path_provider/path_provider/pubspec.yaml

diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
index 8b40207..48fc688 100644
--- a/packages/path_provider/path_provider/pubspec.yaml
+++ b/packages/path_provider/path_provider/pubspec.yaml
@@ -2,11 +2,7 @@
 description: Flutter plugin for getting commonly used locations on the Android &
   iOS file systems, such as the temp and app data directories.
 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
-<<<<<<< HEAD
 version: 1.6.4
-=======
-version: 1.6.3
->>>>>>> master
 
 flutter:
   plugin:
@@ -24,14 +20,8 @@
 dependencies:
   flutter:
     sdk: flutter
-<<<<<<< HEAD
-  platform: ^2.0.0
-  meta: ^1.0.5
   path_provider_platform_interface: ^1.0.1
   path_provider_macos: ^0.0.4
-=======
-  path_provider_platform_interface: ^1.0.1
->>>>>>> master
 
 dev_dependencies:
   e2e: ^0.2.1

packages/path_provider/path_provider/test/path_provider_test.dart

diff --git a/packages/path_provider/path_provider/test/path_provider_test.dart b/packages/path_provider/path_provider/test/path_provider_test.dart
index d3511f5..eb17178 100644
--- a/packages/path_provider/path_provider/test/path_provider_test.dart
+++ b/packages/path_provider/path_provider/test/path_provider_test.dart
@@ -11,11 +11,7 @@
 import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
-<<<<<<< HEAD
-const String kTemproraryPath = 'temporaryPath';
-=======
 const String kTemporaryPath = 'temporaryPath';
->>>>>>> master
 const String kApplicationSupportPath = 'applicationSupportPath';
 const String kDownloadsPath = 'downloadsPath';
 const String kLibraryPath = 'libraryPath';
@@ -33,11 +29,7 @@
 
     test('getTemporaryDirectory', () async {
       Directory result = await getTemporaryDirectory();
-<<<<<<< HEAD
-      expect(result.path, kTemproraryPath);
-=======
       expect(result.path, kTemporaryPath);
->>>>>>> master
     });
 
     test('getApplicationSupportDirectory', () async {
@@ -83,11 +75,7 @@
     with MockPlatformInterfaceMixin
     implements PathProviderPlatform {
   Future<String> getTemporaryPath() async {
-<<<<<<< HEAD
-    return kTemproraryPath;
-=======
     return kTemporaryPath;
->>>>>>> master
   }
 
   Future<String> getApplicationSupportPath() async {