Merge remote-tracking branch 'origin/MAGETWO-71185' into MPI-PR-2.1-develop

viktym · viktym · commit ce7250ac74a1 · 2017-11-17T12:38:48.000+02:00
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
@@ -58,7 +58,6 @@ public function __construct(
      * Initializes credentials.
      *
      * @return void
-     * @deprecated is not used anymore
      */
     protected function initCredentials()
     {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public function __construct(`
`58`	`58`	`* Initializes credentials.`
`59`	`59`	`*`
`60`	`60`	`* @return void`
`61`		`- * @deprecated is not used anymore`
`62`	`61`	`*/`
`63`	`62`	`protected function initCredentials()`
`64`	`63`	`{`