From f0718c4dd25e516278a030d7c01483f10054c088 Mon Sep 17 00:00:00 2001 From: David Henner Date: Thu, 26 Apr 2018 02:06:24 -0700 Subject: [PATCH] bad merge conflict --- db/schema.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/db/schema.rb b/db/schema.rb index 82f5392f6..28377c854 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -221,6 +221,9 @@ t.datetime "send_at" t.datetime "sent_at" t.datetime "created_at", null: false + t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id" + t.index ["type", "user_id"], name: "index_notifications_on_type_and_user_id" + t.index ["user_id"], name: "index_notifications_on_user_id" end create_table "order_items", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|