MAGETWO-41900: Merge Branches and Stabilize Builds

Hayder Sharhan · Hayder Sharhan · commit 52821bf9a635 · 2016-02-21T15:53:53.000-06:00
- static test fixes.
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
@@ -92,7 +92,7 @@ public function getTranslationFilePath()
 
     /**
      * @param string $content
-     * @returns void
+     * @return void
      */
     public function updateTranslationFileContent($content)
     {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function getTranslationFilePath()`
`92`	`92`
`93`	`93`	`/**`
`94`	`94`	`* @param string $content`
`95`		`- * @returns void`
	`95`	`+ * @return void`
`96`	`96`	`*/`
`97`	`97`	`public function updateTranslationFileContent($content)`
`98`	`98`	`{`