Merge pull request #44 from ishkawa/update-carthage-config

ashfurrow · web-flow · commit 17cd7e2ae1d6 · 2016-09-05T20:13:04.000-04:00
Update Carthage configurations
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,7 @@ Pods/
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+#
+Carthage/Checkouts
 Carthage/Build
 .DS_Store
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "ReactiveX/RxSwift" "2.6.0"
