Art oak (#91)

* pull latest master into art-oak (#88) * fix (#76) * Update vehicle_computers.md (#78) * 81/bug/rosdep-dockerfile-fix (#82) * Fix small bug in rosdep dockerfile related to hardcoded art_dev_meta line. * Fix #2 * Added recursive flag to clone in script * Many fixes for agx systems (#84) * Many fixes for agx systems * Small fixes --------- Co-authored-by: harryzhang1018 <[email protected]> Co-authored-by: Aaron Young <[email protected]> * 74/art oak/metapackages (#89) * fix (#76) * Update vehicle_computers.md (#78) * 81/bug/rosdep-dockerfile-fix (#82) * Fix small bug in rosdep dockerfile related to hardcoded art_dev_meta line. * Fix #2 * Added recursive flag to clone in script * Many fixes for agx systems (#84) * Many fixes for agx systems * Small fixes * pre-commit --------- Co-authored-by: harryzhang1018 <[email protected]> Co-authored-by: Aaron Young <[email protected]> * Aaron changes --------- Co-authored-by: harryzhang1018 <[email protected]> Co-authored-by: Aaron Young <[email protected]>
uwsbel · Nov 19, 2023 · 8694707 · 8694707
1 parent 805e279
commit 8694707
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/workspace/src/common/meta/art_oak_meta/package.xml b/workspace/src/common/meta/art_oak_meta/package.xml
@@ -9,9 +9,15 @@
 
   <exec_depend>art_common_meta</exec_depend>
 
+<<<<<<< HEAD
   <exec_depend>art_oak_launch</exec_depend>
   <exec_depend>localization_py</exec_depend>
   <exec_depend>path_planning_waypoints</exec_depend>
+=======
+  <exec_depend>art_launch</exec_depend>
+  <exec_depend>localization_py</exec_depend>
+  <exec_depend>path_planning</exec_depend>
+>>>>>>> d8d6575 (Art oak (#91))
   <exec_depend>control</exec_depend>
   <exec_depend>chrono_ros_interfaces</exec_depend>
   <!-- add sensing -->