[Interstellar] Points to fork with merge() function.

rosco5 · Apr 25, 2016 · fcc3fe2 · fcc3fe2
1 parent 0f9fc96
commit fcc3fe2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Podfile b/Podfile
@@ -105,7 +105,7 @@ target 'Artsy' do
 
   # Swift pods 🎉
   pod 'Then'
-  pod 'Interstellar/Core', git: 'https://github.com/ashfurrow/Interstellar.git', branch: 'podfile-update'
+  pod 'Interstellar/Core', git: 'https://github.com/ashfurrow/Interstellar.git', branch: 'observable-merge'
   pod 'Socket.IO-Client-Swift'
 
   target 'Artsy Tests' do

diff --git a/Podfile.lock b/Podfile.lock
@@ -179,7 +179,7 @@ DEPENDENCIES:
   - FLKAutoLayout (from `https://github.com/orta/FLKAutoLayout.git`, branch `v1`)
   - Forgeries/Mocks (from `https://github.com/ashfurrow/Forgeries.git`, branch `application`)
   - FXBlurView
-  - Interstellar/Core (from `https://github.com/ashfurrow/Interstellar.git`, branch `podfile-update`)
+  - Interstellar/Core (from `https://github.com/ashfurrow/Interstellar.git`, branch `observable-merge`)
   - iRate
   - ISO8601DateFormatter (from `https://github.com/orta/iso-8601-date-formatter`)
   - JLRoutes (from `https://github.com/orta/JLRoutes.git`)
@@ -242,7 +242,7 @@ EXTERNAL SOURCES:
     :branch: application
     :git: https://github.com/ashfurrow/Forgeries.git
   Interstellar:
-    :branch: podfile-update
+    :branch: observable-merge
     :git: https://github.com/ashfurrow/Interstellar.git
   ISO8601DateFormatter:
     :git: https://github.com/orta/iso-8601-date-formatter
@@ -288,7 +288,7 @@ CHECKOUT OPTIONS:
     :commit: 49d17e014367b64d8a91dbe10f28f5d59c7aefb3
     :git: https://github.com/ashfurrow/Forgeries.git
   Interstellar:
-    :commit: 94f09a4adb2e36039b5a3af5624e2bcbe3b30eaa
+    :commit: 3785de4184bd2b61761684d0be07804809681bb3
     :git: https://github.com/ashfurrow/Interstellar.git
   ISO8601DateFormatter:
     :commit: 1a48b819c85903ded669e74e476aceffebf311fc
@@ -365,6 +365,6 @@ SPEC CHECKSUMS:
   VCRURLConnection: accd771ebd4be11183a3e4d5a4403f180a9a235e
   XCTest+OHHTTPStubSuiteCleanUp: 4469ec8863c6bc022c5089a9b94233eb3416c5ee
 
-PODFILE CHECKSUM: 93bbc683bb5d214d63e1f49fdab0eb6a00eb033b
+PODFILE CHECKSUM: 6df5dd6ccd06d6928c509a1b643d2340eb99eac5
 
 COCOAPODS: 1.0.0.beta.8