fix rebase conflicts

3 years ago · b58619dc5a
1 changed files with 1 additions and 1 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -502,11 +502,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_23_160741) do
    t.integer "hhtype"
    t.integer "hodate_check"
    t.bigint "bulk_upload_id"
-    t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
    t.integer "retirement_value_check"
    t.integer "extrabor_value_check"
    t.integer "deposit_and_mortgage_value_check"
    t.integer "grant_value_check"
+    t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
    t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
    t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
    t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"