tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

db/schema.rb: resolve erroneously-unresolved conflict

This commit is contained in:
David Yip 2018-02-04 17:04:22 -06:00
parent a6fb1c58ee
commit e815d6803d
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/schema.rb
View File

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