From 8d0463169e08fad1f160f54b2f86b77eb2320d7a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 18 Dec 2015 17:16:25 +0800
Subject: [PATCH] =?UTF-8?q?gemfile=E6=96=87=E4=BB=B6=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b50f6e97..c739e1085 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,16 +44,12 @@ group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
-<<<<<<< HEAD
-  #gem  'win32console'
-=======
   if RUBY_PLATFORM =~ /w32/
     gem  'win32console'
   end
->>>>>>> 1dae37f613838b2ada8b8f872abec71b256cb1ad
 end
 
-group :development, :test do 
+group :development, :test do
   unless RUBY_PLATFORM =~ /w32/
     gem 'pry-rails'
     if RUBY_VERSION >= '2.0.0'
@@ -62,7 +58,7 @@ group :development, :test do
     gem 'pry-stack_explorer'
     if RUBY_PLATFORM =~ /darwin/
       gem 'puma'
-  end
+    end
   end
 
   gem 'rspec-rails', '~> 3.0'
@@ -76,7 +72,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-   gem 'therubyracer', :platforms => :ruby
+  gem 'therubyracer', :platforms => :ruby
 
   gem 'uglifier', '>= 1.0.3'
 end