fix: fix stashed problem

ichiro-its · Jun 17, 2024 · 8ff56fe · 8ff56fe
1 parent 1ced285
commit 8ff56fe
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/kansei_main.cpp b/src/kansei_main.cpp
@@ -35,11 +35,7 @@ int main(int argc, char * argv[])
 {
   auto args = rclcpp::init_and_remove_ros_arguments(argc, argv);
 
-<<<<<<< Updated upstream
-  std::string port_name = "/dev/ttyUSB1";
-=======
   std::string port_name = "/dev/serial/by-id/usb-Seeed_Seeed_XIAO_M0_E8D70AB55154305147202020FF050926-if00";
->>>>>>> Stashed changes
   std::string path = "";
   kansei::fallen::DeterminantType determinant_type;