fix merging stupids

VEXU-GHOST · Mar 6, 2025 · 0b939e4 · 0b939e4
1 parent f293135
commit 0b939e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/11_Robots/ghost_tank/src/bt_nodes/moveToPoseBoomerang.cpp b/11_Robots/ghost_tank/src/bt_nodes/moveToPoseBoomerang.cpp
@@ -61,25 +61,23 @@ MoveToPoseBoomerang::MoveToPoseBoomerang(const std::string & name, const BT::Nod
 }
 
 // It is mandatory to define this STATIC method.
-<<<<<<< HEAD
 BT::PortsList MoveToPoseBoomerang::providedPorts(){
 	return {
-	    BT::InputPort<double>("posX_tiles"),
-	    BT::InputPort<double>("posY_tiles"),
-	    BT::InputPort<double>("theta_deg"),
+	  BT::InputPort<double>("posX_tiles"),
+	  BT::InputPort<double>("posY_tiles"),
+	  BT::InputPort<double>("theta_deg"),
 		BT::InputPort<double>("search_radius_m"),
-	    BT::InputPort<double>("threshold_m"),
-	    BT::InputPort<double>("angle_threshold_deg"),
+	  BT::InputPort<double>("threshold_m"),
+	  BT::InputPort<double>("angle_threshold_deg"),
 		BT::InputPort<double>("threshold_vel_mps"),
-	    BT::InputPort<double>("angle_threshold_vel_dps"),
+	  BT::InputPort<double>("angle_threshold_vel_dps"),
     BT::InputPort<double>("lead"),
     BT::InputPort<double>("max_speed_linear_pct"),
     BT::InputPort<double>("max_speed_angular_pct"),
     BT::InputPort<int>("timeout_ms"),
     BT::InputPort<bool>("use_theta"),
     BT::InputPort<bool>("backwards"),
   };
->>>>>>> origin/develop
 }
 
 /// Method called once, when transitioning from the state IDLE.

diff --git a/11_Robots/ghost_tank/src/tank_robot_plugin.cpp b/11_Robots/ghost_tank/src/tank_robot_plugin.cpp
@@ -1,4 +1,3 @@
-
 /*
  *   Copyright (c) 2024 Maxx Wilson
  *   All rights reserved.