rebase

Signed-off-by: Daniel Sanchez <[email protected]>
tier4 · Feb 1, 2024 · d4c5af9 · d4c5af9
1 parent 3165a0b
commit d4c5af9
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/autoware_launch/config/planning/preset/default_preset.yaml b/autoware_launch/config/planning/preset/default_preset.yaml
@@ -33,12 +33,6 @@ launch:
   - arg:
       name: launch_side_shift_module
       default: "true"
-<<<<<<< HEAD
-=======
-  - arg:
-      name: use_experimental_lane_change_function
-      default: "false"
->>>>>>> 3bfc06b7d (for integ w/ other modules)
 
   # behavior velocity modules
   - arg: