MAGETWO-49097: Staging. Shopping Cart Price Rules. Builds stabilization

Cari Spruiell · Cari Spruiell · commit dc21428edc44 · 2016-02-18T14:15:33.000-06:00
- fix static test failures
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Actions.php
@@ -133,7 +133,6 @@ protected function _prepareForm()
         return parent::_prepareForm();
     }
 
-
     /**
      * Handles addition of actions tab to supplied form.
      *
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Labels.php
@@ -33,7 +33,6 @@ public function __construct(
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
-
     /**
      * @var string
      */
@@ -117,7 +116,6 @@ protected function _prepareForm()
             $rule->load($id);
         }
 
-
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
         $form->setHtmlIdPrefix('rule_');

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ protected function _prepareForm()`
`133`	`133`	`return parent::_prepareForm();`
`134`	`134`	`}`
`135`	`135`
`136`		`-`
`137`	`136`	`/**`
`138`	`137`	`* Handles addition of actions tab to supplied form.`
`139`	`138`	`*`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function __construct(`
`33`	`33`	`parent::__construct($context, $registry, $formFactory, $data);`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`	`36`	`/**`
`38`	`37`	`* @var string`
`39`	`38`	`*/`
`@@ -117,7 +116,6 @@ protected function _prepareForm()`
`117`	`116`	`$rule->load($id);`
`118`	`117`	`}`
`119`	`118`
`120`		`-`
`121`	`119`	`/** @var \Magento\Framework\Data\Form $form */`
`122`	`120`	`$form = $this->_formFactory->create();`
`123`	`121`	`$form->setHtmlIdPrefix('rule_');`