From 4d2c93930b5c84330a0b4f5a956189e3da0f23fc Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Mon, 30 Nov 2020 10:39:42 -0800 Subject: [PATCH] resolve merge conflict --- app/models/spree/product.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/spree/product.rb b/app/models/spree/product.rb index 2b43358ab1..0f8eeab61c 100755 --- a/app/models/spree/product.rb +++ b/app/models/spree/product.rb @@ -95,6 +95,7 @@ module Spree validates :tax_category_id, presence: true, if: "Spree::Config.products_require_tax_category" validates :variant_unit, presence: true + validates :unit_value, presence: true validates :variant_unit_scale, presence: { if: ->(p) { %w(weight volume).include? p.variant_unit } } validates :variant_unit_name,