chore: error on merge tests

pull/235/head
RuiAlonso 3 years ago
parent bf54c7b0cd
commit 47c9289d09

@ -55,10 +55,8 @@ void main() {
Assets.images.launchRamp.ramp.keyName, Assets.images.launchRamp.ramp.keyName,
Assets.images.launchRamp.foregroundRailing.keyName, Assets.images.launchRamp.foregroundRailing.keyName,
Assets.images.launchRamp.backgroundRailing.keyName, Assets.images.launchRamp.backgroundRailing.keyName,
<<<<<<< HEAD
Assets.images.multiball.lit.keyName, Assets.images.multiball.lit.keyName,
Assets.images.multiball.dimmed.keyName, Assets.images.multiball.dimmed.keyName,
=======
Assets.images.multiplier.x2.lit.keyName, Assets.images.multiplier.x2.lit.keyName,
Assets.images.multiplier.x2.dimmed.keyName, Assets.images.multiplier.x2.dimmed.keyName,
Assets.images.multiplier.x3.lit.keyName, Assets.images.multiplier.x3.lit.keyName,
@ -69,7 +67,6 @@ void main() {
Assets.images.multiplier.x5.dimmed.keyName, Assets.images.multiplier.x5.dimmed.keyName,
Assets.images.multiplier.x6.lit.keyName, Assets.images.multiplier.x6.lit.keyName,
Assets.images.multiplier.x6.dimmed.keyName, Assets.images.multiplier.x6.dimmed.keyName,
>>>>>>> main
Assets.images.plunger.plunger.keyName, Assets.images.plunger.plunger.keyName,
Assets.images.plunger.rocket.keyName, Assets.images.plunger.rocket.keyName,
Assets.images.signpost.inactive.keyName, Assets.images.signpost.inactive.keyName,
@ -133,10 +130,7 @@ void main() {
gameBuilder: () => PinballTestGame(assets: assets), gameBuilder: () => PinballTestGame(assets: assets),
blocBuilder: () => gameBloc, blocBuilder: () => gameBloc,
); );
<<<<<<< HEAD
=======
>>>>>>> main
group('PinballGame', () { group('PinballGame', () {
group('components', () { group('components', () {
// TODO(alestiago): tests that Blueprints get added once the Blueprint // TODO(alestiago): tests that Blueprints get added once the Blueprint
@ -183,7 +177,6 @@ void main() {
}); });
flameBlocTester.test( flameBlocTester.test(
<<<<<<< HEAD
'has only one Multiballs', 'has only one Multiballs',
(game) async { (game) async {
await game.ready(); await game.ready();
@ -196,8 +189,6 @@ void main() {
); );
flameBlocTester.test( flameBlocTester.test(
=======
>>>>>>> main
'one GoogleWord', 'one GoogleWord',
(game) async { (game) async {
await game.ready(); await game.ready();

Loading…
Cancel
Save