From 9e87d27c118465c44558196e84251db3738bde09 Mon Sep 17 00:00:00 2001
From: PenitentTangent2401 <klabuschagne@kd9atp.com>
Date: Mon, 30 Dec 2024 21:38:11 -0600
Subject: [PATCH] fix merge

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36b3e57aa5..28b7cf3b03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,11 +37,7 @@ RUN pip3 install --break-system-packages --no-cache-dir $PYTHONPATH/panda/[dev]
 
 # TODO: this should be a "pip install" or not even in this repo at all
 RUN git config --global --add safe.directory $PYTHONPATH/panda
-<<<<<<< HEAD
 ENV OPENDBC_REF="0ada62db5e26a7d81133ebf483095fc55cec762d"
-=======
-ENV OPENDBC_REF="b89fe79950121ca93d8a1f0d3fd17df31703be2a"
->>>>>>> upstream/master
 RUN cd /tmp/ && \
     git clone --depth 1 https://github.com/commaai/opendbc opendbc_repo && \
     cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \