random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflict

This commit is contained in:
mgabdev 2020-05-12 21:46:04 -04:00
parent ccc3206f8f
commit 42644a136b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/schema.rb
View File

@ -399,11 +399,7 @@ ActiveRecord::Schema.define(version: 2020_05_10_034822) do
create_table "list_accounts", force: :cascade do |t| create_table "list_accounts", force: :cascade do |t|
t.bigint "list_id", null: false t.bigint "list_id", null: false
t.bigint "account_id", null: false t.bigint "account_id", null: false
<<<<<<< HEAD
t.bigint "follow_id", default: nil
=======
t.bigint "follow_id", default: 1 t.bigint "follow_id", default: 1
>>>>>>> f3c3a66e6... Removed unread_count from group_accounts
t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true t.index ["account_id", "list_id"], name: "index_list_accounts_on_account_id_and_list_id", unique: true
t.index ["follow_id"], name: "index_list_accounts_on_follow_id" t.index ["follow_id"], name: "index_list_accounts_on_follow_id"
t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id" t.index ["list_id", "account_id"], name: "index_list_accounts_on_list_id_and_account_id"