Skip to content

Commit

Permalink
resolved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@engcom-Echo
engcom-Echo committed Jun 17, 2020
1 parent 075f997 commit 479166e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,20 +450,19 @@ public function installDataProvider()
['Installing user configuration...'],
['Enabling caches:'],
['Current status:'],
[print_r(['foo' => 1, 'bar' => 1], true)],
['foo: 1'],
['bar: 1'],
['Installing data...'],
['Data install/update:'],
['Disabling caches:'],
['Current status:'],
[print_r([], true)],
['Module \'Foo_One\':'],
['Module \'Bar_Two\':'],
['Data post-updates:'],
['Module \'Foo_One\':'],
['Module \'Bar_Two\':'],
['Enabling caches:'],
['Current status:'],
[print_r([], true)],
['Caches clearing:'],
['Cache cleared successfully'],
['Disabling Maintenance Mode:'],
Expand Down Expand Up @@ -502,20 +501,19 @@ public function installDataProvider()
['Installing user configuration...'],
['Enabling caches:'],
['Current status:'],
[print_r(['foo' => 1, 'bar' => 1], true)],
['foo: 1'],
['bar: 1'],
['Installing data...'],
['Data install/update:'],
['Disabling caches:'],
['Current status:'],
[print_r([], true)],
['Module \'Foo_One\':'],
['Module \'Bar_Two\':'],
['Data post-updates:'],
['Module \'Foo_One\':'],
['Module \'Bar_Two\':'],
['Enabling caches:'],
['Current status:'],
[print_r([], true)],
['Installing admin user...'],
['Caches clearing:'],
['Cache cleared successfully'],
Expand Down

0 comments on commit 479166e

Please sign in to comment.