From 895da6c0e1fe0561fab2900caf510fe4e75b1741 Mon Sep 17 00:00:00 2001
From: RuiAlonso <rui.alonso@verygood.ventures>
Date: Mon, 18 Apr 2022 11:19:09 +0200
Subject: [PATCH] fix: fixed merge conflicts with main at launcher component

---
 lib/game/components/launcher.dart | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/game/components/launcher.dart b/lib/game/components/launcher.dart
index 983d8268..656dd978 100644
--- 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);