jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modify the gemfile conflict by hx

This commit is contained in:
houxiang 2015-12-21 16:00:35 +08:00
parent 5f2e6284ce
commit e8511a6210
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

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

1
db/schema.rb
View File

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