Commit d25ada92 authored by Robert Speicher's avatar Robert Speicher

Resolve db/schema.rb

parent c5366f34
...@@ -2577,11 +2577,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do ...@@ -2577,11 +2577,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
t.index ["name"], name: "index_shards_on_name", unique: true, using: :btree t.index ["name"], name: "index_shards_on_name", unique: true, using: :btree
end end
<<<<<<< .merge_file_BDkhIJ
create_table "site_statistics", force: :cascade do |t|
t.integer "repositories_count", default: 0, null: false
end
create_table "slack_integrations", force: :cascade do |t| create_table "slack_integrations", force: :cascade do |t|
t.integer "service_id", null: false t.integer "service_id", null: false
t.string "team_id", null: false t.string "team_id", null: false
...@@ -2602,8 +2597,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do ...@@ -2602,8 +2597,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
t.index ["user_id"], name: "index_smartcard_identities_on_user_id", using: :btree t.index ["user_id"], name: "index_smartcard_identities_on_user_id", using: :btree
end end
=======
>>>>>>> .merge_file_fNGHHa
create_table "snippets", force: :cascade do |t| create_table "snippets", force: :cascade do |t|
t.string "title" t.string "title"
t.text "content" t.text "content"
......
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