Merge branch 'port-1101' of github.com:magento-mpi/magento2ce into port-1101

Mariana Lashch · Mariana Lashch · commit 70972b020498 · 2019-01-22T15:51:42.000+02:00
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -15,6 +15,8 @@
 
 /**
  * Fields attribute merger.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AttributeMerger
 {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* Fields attribute merger.`
	`18`	`+ *`
	`19`	`+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)`
`18`	`20`	`*/`
`19`	`21`	`class AttributeMerger`
`20`	`22`	`{`