fixed failing tests caused by corrupted Carthage files (contentful#299)

matelo · web-flow · commit deefc3f10d98 · 2020-04-28T09:44:38.000+02:00
diff --git a/.env b/.env
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.0.10
+CONTENTFUL_SDK_VERSION=5.0.11
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ Packages
 *.xcscmblueprint
 
 # Carthage
-Carthage/Build/
+Carthage
 *.framework.zip
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,6 +1,2 @@
 github "venmo/DVR" ~> 1.3.2
-<<<<<<< HEAD
-github "AliSoftware/OHHTTPStubs" ~> 7.0.0
-=======
 github "AliSoftware/OHHTTPStubs" ~> 8.0.0
->>>>>>> master
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-github "AliSoftware/OHHTTPStubs" "7.0.0"
-=======
 github "AliSoftware/OHHTTPStubs" "8.0.0"
->>>>>>> master
 github "venmo/DVR" "v1.3.2"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
@@ -1 +1 @@
-Subproject commit 543182991a0d59db81f5b835a40901a9a386847d
+Subproject commit a5f9693dbf7a98e91cd7b72fff02bdd291ac66e0
diff --git a/Config.xcconfig b/Config.xcconfig
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.0.10
+CONTENTFUL_SDK_VERSION=5.0.11
