Skip to content

Commit a604fb4

Browse files
committed
firestore pod file merge
1 parent 77e56ac commit a604fb4

File tree

1 file changed

+0
-5
lines changed
  • firestore/integration_test_internal

1 file changed

+0
-5
lines changed

firestore/integration_test_internal/Podfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '10.0'
7-
<<<<<<< HEAD
8-
pod 'Firebase/Firestore', '8.13.0'
9-
pod 'Firebase/Auth', '8.13.0'
10-
=======
117
pod 'Firebase/Firestore', '9.0.0'
128
pod 'Firebase/Auth', '9.0.0'
13-
>>>>>>> main
149
end
1510

1611
target 'integration_test_tvos' do

0 commit comments

Comments
 (0)