Correctly merge in upstream Dockerfile changes

cisagov · Jul 28, 2023 · c160bb0 · c160bb0
1 parent 0c45c44
commit c160bb0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,7 @@
 ARG VERSION=unspecified
 ARG PY_VERSION=3.10.7
 
-<<<<<<< HEAD
 FROM python:${PY_VERSION}-slim-bullseye AS compile-stage
-=======
-FROM python:3.11.4-alpine
->>>>>>> 8c26a61517f4254b82bb73a78544145c62828a89
 
 ARG VERSION