From 47c9289d0943711ab2e351cbb2aaecbb2dbf48b9 Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Sat, 30 Apr 2022 17:51:42 +0200
Subject: [PATCH] chore: error on merge tests

---
 test/game/pinball_game_test.dart | 9 ---------
 1 file changed, 9 deletions(-)

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