gemfile文件冲突问题

dev_hjq v20151218_01
huang 10 years ago
parent 88cdb5a3ed
commit 8d0463169e

@ -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

Loading…
Cancel
Save