fix merge

PenitentTangent2401 · Dec 31, 2024 · 9e87d27 · 9e87d27
1 parent 7c8a32d
commit 9e87d27
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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/ && \