fix: fixed merge conflicts with main at launcher component

3 years ago · 895da6c0e1
parent 1db1e6a8dc
commit 895da6c0e1
1 changed files with 0 additions and 5 deletions
--- a/lib/game/components/launcher.dart
+++ b/lib/game/components/launcher.dart
@ -16,13 +16,8 @@ class Launcher extends Forge2DBlueprint {

  @override
  void build(Forge2DGame gameRef) {
-<<<<<<< HEAD
    plunger = ControlledPlunger(compressionDistance: 20) //12.3
      ..initialPosition = Vector2(38.5, -20);
-=======
-    plunger = ControlledPlunger(compressionDistance: 12.3)
-      ..initialPosition = Vector2(40.1, 38);
->>>>>>> main

    final _rocket = RocketSpriteComponent()..position = Vector2(43, 62);