Merge branch 'MAGETWO-30745-csv' into develop

Mike Weis · Mike Weis · commit 735b9369705c · 2015-01-05T15:30:02.000-06:00
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Model/Rate/CsvImportHandlerTest.php
@@ -7,7 +7,7 @@
 class CsvImportHandlerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Tax\Model\Rate\CsvImportHandler
+     * @var \Magento\TaxImportExport\Model\Rate\CsvImportHandler
      */
     protected $_importHandler;
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class CsvImportHandlerTest extends \PHPUnit_Framework_TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * @var \Magento\Tax\Model\Rate\CsvImportHandler`
	`10`	`+ * @var \Magento\TaxImportExport\Model\Rate\CsvImportHandler`
`11`	`11`	`*/`
`12`	`12`	`protected $_importHandler;`
`13`	`13`