diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-04 17:04:22 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-04 17:04:22 -0600 |
| commit | e815d6803d3e7c607e8bb04a5a14048ab08e6508 (patch) | |
| tree | 3e4ee2d3511801a806ec7f176b7f26f3e79b464b /db/schema.rb | |
| parent | a6fb1c58eead1357a307813c69f798f32bcf7cae (diff) | |
db/schema.rb: resolve erroneously-unresolved conflict
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/db/schema.rb b/db/schema.rb index bc44b65af..09567de35 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -545,11 +545,8 @@ ActiveRecord::Schema.define(version: 20180204034416) do add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade -<<<<<<< HEAD add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade -======= add_foreign_key "identities", "users", on_delete: :cascade ->>>>>>> origin/master add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade add_foreign_key "invites", "users", on_delete: :cascade add_foreign_key "list_accounts", "accounts", on_delete: :cascade |