Fix ci

.gitlab-ci.yml

@@ -20,7 +20,6 @@ stages:
       - PYTHON_VERSION: ['3.8', '3.9', '3.10']
         DEBIAN_VERSION: ['buster', 'bullseye']
 
-<<<<<<< HEAD
 create-debian:
   stage: debian-build
   image: debian:bookworm
@@ -67,24 +66,3 @@ release_job:
       links:
         - name: procset-${CI_COMMIT_TAG}.tar.gz
           url: ${CI_PROJECT_URL}-/jobs/${JOB_ID}/artifacts/raw/procset-${CI_COMMIT_TAG}.tar.gz
-=======
-pytest:3.9:
-  extends: .pytest
-  image: python:3.9-slim-buster
-
-pytest:3.8:
-  extends: .pytest
-  image: python:3.8-slim-buster
-
-pytest:3.7:
-  extends: .pytest
-  image: python:3.7-slim-stretch
-
-pytest:3.6:
-  extends: .pytest
-  image: python:3.6-slim-stretch
-
-pytest:3.5:
-  extends: .pytest
-  image: python:3.5-slim-stretch
->>>>>>> ac84b00 (Fix python docker images)