From b58619dc5a45c40ee257e263f1176fe9238b00e6 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Thu, 26 Jan 2023 11:11:02 +0000 Subject: [PATCH] fix rebase conflicts --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 1efdd02bb..0165919dc 100644 --- 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"