Skip to content

Commit 29bb9be

Browse files
committed
Merge branch 'test-realtime-rc'
2 parents c2807b5 + 2d48d35 commit 29bb9be

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

FirebaseSessions.podspec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ Pod::Spec.new do |s|
4242
s.dependency 'FirebaseCoreExtension', '~> 10.0'
4343
s.dependency 'FirebaseInstallations', '~> 10.0'
4444

45-
<<<<<<< HEAD:FirebaseStorageInternal.podspec
46-
s.dependency 'FirebaseCore', '~> 9.0'
47-
s.dependency 'GTMSessionFetcher/Core', '>= 1.7', '< 2.1'
48-
=======
49-
>>>>>>> master:FirebaseSessions.podspec
5045
s.pod_target_xcconfig = {
5146
'GCC_C_LANGUAGE_STANDARD' => 'c99',
5247
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'

Package.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ let package = Package(
165165
.package(
166166
name: "GTMSessionFetcher",
167167
url: "https://github.com/google/gtm-session-fetcher.git",
168-
<<<<<<< HEAD
169-
"1.7.2" ..< "2.1.0"
170-
=======
171168
"2.1.0" ..< "3.0.0"
172-
>>>>>>> master
173169
),
174170
.package(
175171
name: "nanopb",

0 commit comments

Comments
 (0)