From c40a7b65baece18057d6ebe1e95fc390abea8488 Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Sat, 5 Jul 2014 11:13:41 -0600
Subject: [PATCH] Gemfile change

---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index f29b4ca..8a31792 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'oauth2', '~> 0.8.0'
 gem 'carrierwave'
 gem 'carrierwave-imageoptimizer'
 gem 'mini_magick'
-gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+#gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
 gem 'carmen-rails'
 gem 'nested_form'
 gem 'acts_as_list'
diff --git a/Gemfile.lock b/Gemfile.lock
index a7274e5..218dac4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,11 +12,6 @@ GIT
     i18n-active_record (0.0.2)
       i18n (>= 0.5.0)
 
-PATH
-  remote: ../carmen/
-  specs:
-    carmen (1.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -71,6 +66,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carmen (1.0.1)
+      unicode_utils (~> 1.4.0)
     carmen-rails (1.0.1)
       carmen (~> 1.0.0)
       rails
@@ -302,6 +299,7 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode_utils (1.4.0)
     wdm (0.1.0)
     webmock (1.18.0)
       addressable (>= 2.3.6)
@@ -321,7 +319,6 @@ DEPENDENCIES
   binding_of_caller
   capistrano
   capybara
-  carmen!
   carmen-rails
   carrierwave
   carrierwave-imageoptimizer