Merge remote-tracking branch 'origin/#14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products' into #14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products

novikor · novikor · commit 5a7e78af8c68 · 2018-08-09T13:25:44.000+03:00
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
@@ -24,7 +24,6 @@ public function beforeValidate(
         );
     }
 
-
     /**
      * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
      * @param \Magento\Framework\Model\AbstractModel          $model

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public function beforeValidate(`
`24`	`24`	`);`
`25`	`25`	`}`
`26`	`26`
`27`		`-`
`28`	`27`	`/**`
`29`	`28`	`* @param \Magento\SalesRule\Model\Rule\Condition\Product $subject`
`30`	`29`	`* @param \Magento\Framework\Model\AbstractModel $model`