Merge pull request #64 from Carthage/rac4.2.1

mdiep · web-flow · commit f412cc77c9a4 · 2016-07-03T07:40:16.000-07:00
Update ReactiveCocoa to v4.2.1
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 4.2
+github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "Quick/Nimble" "v4.0.0"
 github "Quick/Quick" "v0.9.2"
-github "antitypical/Result" "2.0.0"
+github "antitypical/Result" "2.1.2"
 github "jspahrsummers/xcconfigs" "0.9"
-github "ReactiveCocoa/ReactiveCocoa" "v4.2.0"
+github "ReactiveCocoa/ReactiveCocoa" "v4.2.1"
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit 5cfcdccdcc693e7d685b4f7b7cf2c2ccf5c59c8d
+Subproject commit 6f52f8bbdf1118431b3984a1e2858e6eecf444e6
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 5dec9cf225d5fa3b0602679fb2638e40191da46b
+Subproject commit efa4c04a65ba0af37ca5320993875f73ecb1cfa0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" ~> 4.2`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" ~> 4.2.1`