merge fix

2025-05-30 16:02:37 +10:00
parent a3db1ae993
commit b87dc1da9e
4 changed files with 0 additions and 93 deletions
@@ -7,17 +7,12 @@ ENV PYTHONUNBUFFERED 1

 ADD src/ /blog_creator

-<<<<<<< HEAD
 RUN apt-get update && apt-get install -y rustc cargo python-is-python3 pip python3-venv libmagic-dev git
 # Need to set up git here or we get funky errors
 RUN git config --global user.name "Blog Creator"
 RUN git config --global user.email "ridgway.infrastructure@gmail.com"
 RUN git config --global push.autoSetupRemote true
 #Get a python venv going as well cause safety
-=======
-RUN apt-get update && apt-get install -y rustc cargo python-is-python3 pip python3-venv libmagic-dev 
-
->>>>>>> d35a456 (set up chroma)
 RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"