MAGETWO-71255: Merge 2.2 into develop mainline (2.3)

- stabilize builds
chntylz · Aug 1, 2017 · 0a1d85c · 0a1d85c
1 parent 80b137e
commit 0a1d85c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
@@ -233,7 +233,7 @@ public function provideUniqueData()
                         "option_1" => "",
                         "option_2" => "",
                     ]
-                ], true
+                ], false
             ],
             'duplicate and deleted' => [
                 [

diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
@@ -40,7 +40,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
 {
     /**
      * Mail object
-     * 
+     *
      * @deprecated Unused property
      *
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate @@
     {
         /**
          * Mail object
-         *
+         *
          * @deprecated Unused property
          *
          */
@@ Expand Down @@