Merge pull request #1077 from artsy/pod-update

ashfurrow · ashfurrow · commit 524d700accd0 · 2016-01-28T12:37:57.000-05:00
Moved pod back to trunk.
diff --git a/Podfile b/Podfile
@@ -54,7 +54,7 @@ target 'Artsy' do
   pod 'NPKeyboardLayoutGuide'
   pod 'ReactiveCocoa'
   pod 'UICKeyChainStore'
-  pod 'MARKRangeSlider', :git => 'https://github.com/ashfurrow/MARKRangeSlider.git' # Pending https://github.com/vadymmarkov/MARKRangeSlider/pull/22
+  pod 'MARKRangeSlider'
 
   # Core owned by Artsy
   pod 'ARTiledImageView', :git => 'https://github.com/dblock/ARTiledImageView'
diff --git a/Podfile.lock b/Podfile.lock
@@ -101,7 +101,7 @@ PODS:
   - Mantle (1.5.6):
     - Mantle/extobjc (= 1.5.6)
   - Mantle/extobjc (1.5.6)
-  - MARKRangeSlider (1.0.0)
+  - MARKRangeSlider (1.0.1)
   - MMMarkdown (0.4)
   - MultiDelegate (0.0.2)
   - NAMapKit (3.2.0):
@@ -179,7 +179,7 @@ DEPENDENCIES:
   - Keys (from `Pods/CocoaPodsKeys`)
   - KSDeferred
   - Mantle (~> 1.5.6)
-  - MARKRangeSlider (from `https://github.com/ashfurrow/MARKRangeSlider.git`)
+  - MARKRangeSlider
   - MMMarkdown
   - MultiDelegate
   - NAMapKit (from `https://github.com/neilang/NAMapKit`)
@@ -236,8 +236,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/orta/JLRoutes.git
   Keys:
     :path: Pods/CocoaPodsKeys
-  MARKRangeSlider:
-    :git: https://github.com/ashfurrow/MARKRangeSlider.git
   NAMapKit:
     :git: https://github.com/neilang/NAMapKit
   ORStackView:
@@ -283,9 +281,6 @@ CHECKOUT OPTIONS:
   JLRoutes:
     :commit: 5a6df1a795766a4d3e586508e86ec9271d3ef3d9
     :git: https://github.com/orta/JLRoutes.git
-  MARKRangeSlider:
-    :commit: aefbeb181b62c8c257a7d0ada1e75834489b1909
-    :git: https://github.com/ashfurrow/MARKRangeSlider.git
   NAMapKit:
     :commit: 9a2b842a1067785cf8af18276d4de4f0e3f0a17c
     :git: https://github.com/neilang/NAMapKit
@@ -331,7 +326,7 @@ SPEC CHECKSUMS:
   Keys: 7d2ff6ff42f6903358267ce56e9392f83c31acfe
   KSDeferred: e72d005162986b2978e1e2eee17fbce1c6876cfe
   Mantle: a197db93e0f1e36194b1fdbc078219a8492eaef2
-  MARKRangeSlider: fd8b0671017f0089d846b1ec3728dfe7751c6dee
+  MARKRangeSlider: dbf0878b03e921b52e4ef1e7766c1a8affb0c577
   MMMarkdown: 44f1c5216cfcd70bc0e076b0f91876d6323a73b8
   MultiDelegate: d224a4af1c098e1de280c3eaee2f16ebf8b046f4
   NAMapKit: bdcb666fa84122eed344661b132e1d93dbafac71
