This commit is contained in:
parent
85aade79ce
commit
d992809623
|
@ -605,7 +605,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
|
|||
end
|
||||
|
||||
create_table "exercise_questions", :force => true do |t|
|
||||
t.string "question_title"
|
||||
t.text "question_title"
|
||||
t.integer "question_type"
|
||||
t.integer "question_number"
|
||||
t.integer "exercise_id"
|
||||
|
@ -634,7 +634,7 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
|
|||
end
|
||||
|
||||
create_table "exercises", :force => true do |t|
|
||||
t.string "exercise_name"
|
||||
t.text "exercise_name"
|
||||
t.text "exercise_description"
|
||||
t.integer "course_id"
|
||||
t.integer "exercise_status"
|
||||
|
@ -1151,10 +1151,6 @@ ActiveRecord::Schema.define(:version => 20151127011351) do
|
|||
create_table "org_members", :force => true do |t|
|
||||
t.integer "user_id"
|
||||
t.integer "organization_id"
|
||||
<<<<<<< HEAD
|
||||
t.string "role"
|
||||
=======
|
||||
>>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d
|
||||
t.datetime "created_at", :null => false
|
||||
t.datetime "updated_at", :null => false
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue