From 724b294c0a2de96af2a13f57d81b427dc2b76cd0 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Thu, 17 Nov 2022 14:42:20 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cbbce9..890d21a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,7 @@ variables:
   CI_IMAGES_BASEPATH: "git.seco.com:5050/edgehog/yocto_ng/"
   CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/seco-manifest/python3.9
   CI_IMAGES_REV: latest
-<<<<<<< HEAD
   CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:${CI_IMAGES_REV}"
-=======
-  CI_IMAGE_PYTHON: "git.seco.com:5050/edgehog/yocto_ng/seco-manifest/python3.9:CI_IMAGES_REV"
->>>>>>> b679bc717765558814e0e1a6855bab5941d17255
   CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
 
 image: "${CI_IMAGE_PYTHON}" #secodocker/manifest-test:vtemp #
-- 
GitLab