From a642a1b1d2f45d119867e6669ca4aa487f47b4af Mon Sep 17 00:00:00 2001
From: Ryan Friedman <ryanfriedman5410+github@gmail.com>
Date: Fri, 19 Jan 2024 21:33:31 -0700
Subject: [PATCH] Fix merge conflicts

Signed-off-by: Ryan Friedman <ryanfriedman5410+github@gmail.com>
---
 .github/workflows/build_test.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 4ed8ba0..b87c819 100644
--- 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