Skip to content

Commit 8139c4b

Browse files
committed
Fix merge conflicts
2 parents db2eff8 + 02f4d25 commit 8139c4b

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ end
4545
def wordpress_kit
4646
pod 'WordPressKit', '~> 4.5.9-beta'
4747
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'fix/datarequest-weak-reference'
48-
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '0ab4bb57ae5ba77e8f705ab987d8affa7e188d18'
48+
#pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => '13db93f88726cfb9503384723ceb727e99521398'
4949
#pod 'WordPressKit', :path => '../WordPressKit-iOS'
5050
end
5151

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,6 @@ SPEC CHECKSUMS:
706706
ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
707707
ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
708708

709-
PODFILE CHECKSUM: ac0cd4682fb44e5e25123b7ddc3ffa7a42fad785
709+
PODFILE CHECKSUM: f693af435ca21563807b6ff78df7e02877163056
710710

711711
COCOAPODS: 1.8.4

0 commit comments

Comments
 (0)