From 14e3210276070882a5668cfe1a3cc72279986ab7 Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Tue, 5 Apr 2022 18:35:54 +0100
Subject: [PATCH] fix: merge conflicts

---
 lib/game/pinball_game.dart   | 5 -----
 test/helpers/extensions.dart | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/game/pinball_game.dart b/lib/game/pinball_game.dart
index c35d82c6..3c99fbca 100644
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@@ -88,11 +88,6 @@ class PinballGame extends Forge2DGame
     );
   }
 
-  Future<void> _addRamps() async {
-    unawaited(addFromBlueprint(SpaceshipRamp()));
-    unawaited(addFromBlueprint(LaunchRamp()));
-  }
-
   Future<void> spawnBall() async {
     // TODO(alestiago): Remove once this logic is moved to controller.
     var plunger = firstChild<Plunger>();
diff --git a/test/helpers/extensions.dart b/test/helpers/extensions.dart
index 66817a24..4731eec4 100644
--- a/test/helpers/extensions.dart
+++ b/test/helpers/extensions.dart
@@ -6,9 +6,9 @@ import 'helpers.dart';
 class PinballGameTest extends PinballGame {
   PinballGameTest()
       : super(
+          audio: MockPinballAudio(),
           theme: const PinballTheme(
             characterTheme: DashTheme(),
-            audio: MockPinballAudio(),
           ),
         );
 }
@@ -16,9 +16,9 @@ class PinballGameTest extends PinballGame {
 class DebugPinballGameTest extends DebugPinballGame {
   DebugPinballGameTest()
       : super(
+          audio: MockPinballAudio(),
           theme: const PinballTheme(
             characterTheme: DashTheme(),
-            audio: MockPinballAudio(),
           ),
         );
 }