Fix merge conflicts

Signed-off-by: Ryan Friedman <[email protected]>
ethz-asl · Jan 20, 2024 · a642a1b · a642a1b
1 parent 1ccd5d3
commit a642a1b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -18,14 +18,9 @@ jobs:
     container: ${{ matrix.config.container }}
     steps:
     - uses: actions/checkout@v4
-<<<<<<< HEAD
-    - name: Install Dependencies
-      working-directory: 
-=======
       with:
         path: src/grid_map_geo
     - name: Install Dependencies with Rosdep
->>>>>>> f258d15 (Use rosdep to install dependencies in ROS workspaces)
       run: |
         apt update
         rosdep update