fix: merge conflicts

4 years ago · 139b3f5656
parent 3ef513915f
commit 139b3f5656
1 changed files with 1 additions and 2 deletions
--- a/lib/game/pinball_game.dart
+++ b/lib/game/pinball_game.dart
@ -42,8 +42,7 @@ class PinballGame extends Forge2DGame
    unawaited(addFromBlueprint(LaunchRamp()));
    final plunger = Plunger(compressionDistance: 29)
-      ..initialPosition =
+      ..initialPosition = Vector2(38, -19);
          BoardDimensions.bounds.center.toVector2() + Vector2(41.5, -49);
    await add(plunger);
    unawaited(add(Board()));