From 1a8ebb710e584dfd53ebb17a8d921872cbf3cc8c Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 18 Feb 2014 13:50:00 -0500
Subject: [PATCH] Rollback faraday gem to fix conflicts

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c206b591b81..f8fd0bc92b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
     exifr (1.1.3)
     fabrication (2.9.8)
     fakeweb (1.3.0)
-    faraday (0.9.0)
+    faraday (0.8.8)
       multipart-post (>= 1.2, < 3)
     fast_blank (0.0.2)
     fast_stack (0.1.0)