From 36b72b3300cd0188df6d1645ea1a4dd1f418a681 Mon Sep 17 00:00:00 2001
From: George Bisbas <g.bisbas18@imperial.ac.uk>
Date: Wed, 5 Jul 2023 12:48:58 +0100
Subject: [PATCH] docker: Update to python3.9

---
 docker/Dockerfile.cpu | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker/Dockerfile.cpu b/docker/Dockerfile.cpu
index 20a95d04bfa..f0d46352ba8 100644
--- a/docker/Dockerfile.cpu
+++ b/docker/Dockerfile.cpu
@@ -3,11 +3,7 @@
 # This Dockerfile contains the Devito codes and can be built using different base images.
 ##############################################################
 
-<<<<<<< HEAD
-ARG pyversion=python:3.9
-=======
 ARG pyversion=python:3.8
->>>>>>> 66c0b76b5 (ci: Update python versions, end-of-life for python 3.7)
 ARG arch=gcc
 ARG OMPI_BRANCH="v4.1.4"