bad merge conflict

drhenner · Apr 26, 2018 · f0718c4 · f0718c4
1 parent d9d63da
commit f0718c4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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|