From e8511a6210896d1d9c2c2354f87e2b2472087a7f Mon Sep 17 00:00:00 2001 From: houxiang Date: Mon, 21 Dec 2015 16:00:35 +0800 Subject: [PATCH] modify the gemfile conflict by hx --- Gemfile | 5 +---- db/schema.rb | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 2b50f6e97..5fe70bc76 100644 --- a/Gemfile +++ b/Gemfile @@ -44,13 +44,10 @@ 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 diff --git a/db/schema.rb b/db/schema.rb index 27de276b1..c86c3002c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1554,6 +1554,7 @@ ActiveRecord::Schema.define(:version => 20151217051447) do end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" + add_index "student_works", ["homework_common_id"], :name => "index" create_table "student_works_evaluation_distributions", :force => true do |t| t.integer "student_work_id"