From 8ff56fe02982a56e5f7d096c0a716ff552f2d2a3 Mon Sep 17 00:00:00 2001 From: hiikariri Date: Tue, 18 Jun 2024 02:12:35 +0700 Subject: [PATCH] fix: fix stashed problem --- src/kansei_main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/kansei_main.cpp b/src/kansei_main.cpp index 80b05b5..844d110 100755 --- 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;