feat: (future) conflict resolving

4 years ago · 29b100a3c1
2 changed files with 0 additions and 8 deletions
--- a/db/migrate/20221223115948_add_buyer_serving_to_sales.rb
+++ b/db/migrate/20221223115948_add_buyer_serving_to_sales.rb
@ -1,7 +0,0 @@
 class AddBuyerServingToSales < ActiveRecord::Migration[7.0]
  def change
    change_table :sales_logs, bulk: true do |t|
      t.column :hhregres, :integer
    end
  end
 end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -420,7 +420,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_23_115948) do
    t.integer "pregghb"
    t.integer "pregother"
    t.integer "disabled"
    t.integer "hhregres"
    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"