gemfile文件冲突问题

10 years ago · 8d0463169e
parent 88cdb5a3ed
commit 8d0463169e
1 changed files with 3 additions and 7 deletions
--- a/4
+++ b/4
@ -44,13 +44,9 @@ 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