From 4dd73d7685252df98950ed6d96d0221fde850e27 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Thu, 26 Jan 2023 16:02:35 +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 6f21c94de..57240fe32 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -487,7 +487,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do t.integer "hoyear" t.integer "fromprop" t.integer "socprevten" - t.integer "mortlen" t.integer "mortgagelender" t.string "mortgagelenderother" t.integer "extrabor" @@ -509,6 +508,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do t.integer "old_persons_shared_ownership_value_check" t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id" t.integer "shared_ownership_deposit_value_check" + t.integer "mortlen" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["updated_by_id"], name: "index_sales_logs_on_updated_by_id"