reconcile master branch merge conflicts

Author: qdpham13

FirebaseSessions.podspec

@@ -42,11 +42,6 @@ Pod::Spec.new do |s|
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
   s.dependency 'FirebaseInstallations', '~> 10.0'
 
-<<<<<<< HEAD:FirebaseStorageInternal.podspec
-  s.dependency 'FirebaseCore', '~> 9.0'
-  s.dependency 'GTMSessionFetcher/Core', '>= 1.7', '< 2.1'
-=======
->>>>>>> master:FirebaseSessions.podspec
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'

Package.swift

@@ -165,11 +165,7 @@ let package = Package(
     .package(
       name: "GTMSessionFetcher",
       url: "https://github.com/google/gtm-session-fetcher.git",
-<<<<<<< HEAD
-      "1.7.2" ..< "2.1.0"
-=======
       "2.1.0" ..< "3.0.0"
->>>>>>> master
     ),
     .package(
       name: "nanopb",