From c4bc2b36752c04d028f2a5975e9ccbd1f9432262 Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Sun, 17 Mar 2013 05:19:43 -0400
Subject: [PATCH] reset the gemfile

---
 Gemfile  | 4 ++--
 Gemfile~ | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1f7c3bd8..cb1ac1c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,8 +13,8 @@ gem 'formtastic'
 gem 'json'
 gem 'rails3-jquery-autocomplete'
 gem 'best_in_place'
-#gem 'therubyracer' #optional
-#gem 'rb-readline'
+gem 'therubyracer' #optional
+gem 'rb-readline'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile~ b/Gemfile~
index 6b2f6e48..1f7c3bd8 100644
--- a/Gemfile~
+++ b/Gemfile~
@@ -14,7 +14,7 @@ gem 'json'
 gem 'rails3-jquery-autocomplete'
 gem 'best_in_place'
 #gem 'therubyracer' #optional
-gem 'rb-readline'
+#gem 'rb-readline'
 
 # Gems used only for assets and not required
 # in production environments by default.