fix merge comfict

SFU-MARS · Oct 23, 2024 · dc83ee3 · dc83ee3
1 parent 111f0a7
commit dc83ee3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/controller/launch/experiment.launch.py b/src/controller/launch/experiment.launch.py
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 import os
 from ament_index_python import get_package_share_directory
-=======
->>>>>>> origin/main
 from launch import LaunchDescription
 from launch_ros.actions import Node