Merge branch 'develop' of github.corp.magento.com:magento2/sample-data into MAGETWO-47395

YevSent · YevSent · commit 74e0482670b0 · 2016-02-24T16:55:03.000+02:00
diff --git a/app/code/Magento/ThemeSampleData/Setup/Installer.php b/app/code/Magento/ThemeSampleData/Setup/Installer.php
@@ -49,7 +49,7 @@ public function __construct(
     public function install()
     {
         $this->assignTheme();
-        $this->css->install(['Magento_CmsSampleData::fixtures/styles.css' => 'styles.css']);
+        $this->css->install(['Magento_ThemeSampleData::fixtures/styles.css' => 'styles.css']);
     }
 
     /**
@@ -71,4 +71,4 @@ protected function assignTheme()
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function __construct(`
`49`	`49`	`public function install()`
`50`	`50`	`{`
`51`	`51`	`$this->assignTheme();`
`52`		`- $this->css->install(['Magento_CmsSampleData::fixtures/styles.css' => 'styles.css']);`
	`52`	`+ $this->css->install(['Magento_ThemeSampleData::fixtures/styles.css' => 'styles.css']);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`@@ -71,4 +71,4 @@ protected function assignTheme()`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`