vlm和tts

2026-07-23 14:51:51 +08:00
parent 90761b40b2
commit a5cee5e142
35 changed files with 12694 additions and 168 deletions
--- a/src/origincar_description/CMakeLists.txt
+++ b/src/origincar_description/CMakeLists.txt
@@ -22,11 +22,7 @@ find_package(ament_cmake REQUIRED)
 # find_package(<dependency> REQUIRED)

 install(
-<<<<<<< HEAD
  DIRECTORY launch urdf rviz meshes world 
-=======
-  DIRECTORY launch urdf rviz meshes world
->>>>>>> mo_new
  DESTINATION share/${PROJECT_NAME}
 )