Skip to content

Commit ab21961

Browse files
committed
chore: resolve conflicts from develop
1 parent 289331f commit ab21961

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

examples/SampleApp/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,7 +2166,7 @@ PODS:
21662166
- libwebp (~> 1.0)
21672167
- SDWebImage/Core (~> 5.10)
21682168
- SocketRocket (0.7.1)
2169-
- stream-chat-react-native (5.43.1):
2169+
- stream-chat-react-native (5.43.2):
21702170
- DoubleConversion
21712171
- glog
21722172
- hermes-engine
@@ -2489,7 +2489,7 @@ SPEC CHECKSUMS:
24892489
FirebaseMessaging: 4d52717dd820707cc4eadec5eb981b4832ec8d5d
24902490
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
24912491
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
2492-
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
2492+
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
24932493
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
24942494
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
24952495
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
@@ -2578,7 +2578,7 @@ SPEC CHECKSUMS:
25782578
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
25792579
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
25802580
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2581-
stream-chat-react-native: 98ee8e5faacce9bbdcbf8579802c6d04897e48d0
2581+
stream-chat-react-native: 54bf193fb71d80dd8dd31b75bbaf6070525c72f2
25822582
Yoga: 83048fe4b4ce15018a5e9ccbf0b06bd76fc643d4
25832583

25842584
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

0 commit comments

Comments
 (0)