From dc7e0a646a12a144493ddfe2d0aece61d8dd7409 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed <h.4hmz4@gmail.com>
Date: Thu, 23 Dec 2021 00:27:25 +0000
Subject: [PATCH] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 195343f..c6e84ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,8 @@ Build:
       - public
   only:
     - main
-<<<<<<< HEAD
 
 
-=======
->>>>>>> f07b1f2 (only build for changes made to main)
-
 Dockerize:
   stage: dockerize
   image:
@@ -42,8 +38,3 @@ Dockerize:
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
   only:
     - main
-<<<<<<< HEAD
-
-
-=======
->>>>>>> f07b1f2 (only build for changes made to main)