Commit 49b45fca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix conflict in db/schema.rb

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6929e1c3
...@@ -214,7 +214,7 @@ ActiveRecord::Schema.define(version: 20180808162000) do ...@@ -214,7 +214,7 @@ ActiveRecord::Schema.define(version: 20180808162000) do
t.string "snowplow_cookie_domain" t.string "snowplow_cookie_domain"
t.boolean "instance_statistics_visibility_private", default: false, null: false t.boolean "instance_statistics_visibility_private", default: false, null: false
t.boolean "web_ide_clientside_preview_enabled", default: false, null: false t.boolean "web_ide_clientside_preview_enabled", default: false, null: false
<<<<<<< HEAD t.boolean "user_show_add_ssh_key_message", default: true, null: false
t.integer "custom_project_templates_group_id" t.integer "custom_project_templates_group_id"
end end
...@@ -244,9 +244,6 @@ ActiveRecord::Schema.define(version: 20180808162000) do ...@@ -244,9 +244,6 @@ ActiveRecord::Schema.define(version: 20180808162000) do
t.integer "user_id", null: false t.integer "user_id", null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
=======
t.boolean "user_show_add_ssh_key_message", default: true, null: false
>>>>>>> upstream/master
end end
add_index "approvers", ["target_id", "target_type"], name: "index_approvers_on_target_id_and_target_type", using: :btree add_index "approvers", ["target_id", "target_type"], name: "index_approvers_on_target_id_and_target_type", using: :btree
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment