resolved conflict

engcom-Echo · engcom-Echo · commit 9d417ec96f06 · 2020-06-05T13:18:26.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/ViewTest.php b/dev/tests/integration/testsuite/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/ViewTest.php
@@ -117,8 +117,6 @@ private function assertUrlRewritesCount(int $storeId, string $requestPath, int $
 
     /**
      * Create test store
-     *
-     * @return int
      */
     private function createStore(): int
     {
@@ -135,7 +133,6 @@ private function createStore(): int
      * Delete test store
      *
      * @param int $storeId
-     * @return void
      */
     private function deleteStore(int $storeId): void
     {

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,6 @@ private function assertUrlRewritesCount(int $storeId, string $requestPath, int $`
`117`	`117`
`118`	`118`	`/**`
`119`	`119`	`* Create test store`
`120`		`- *`
`121`		`- * @return int`
`122`	`120`	`*/`
`123`	`121`	`private function createStore(): int`
`124`	`122`	`{`
`@@ -135,7 +133,6 @@ private function createStore(): int`
`135`	`133`	`* Delete test store`
`136`	`134`	`*`
`137`	`135`	`* @param int $storeId`
`138`		`- * @return void`
`139`	`136`	`*/`
`140`	`137`	`private function deleteStore(int $storeId): void`
`141`	`138`	`{`