From feeeaed27f74e9d894c54d51c7f493d3573909a0 Mon Sep 17 00:00:00 2001
From: Anover000 <ankit@fynarfin.io>
Date: Wed, 9 Aug 2023 21:12:58 +0530
Subject: [PATCH] fix last bad commit

---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2fe031a5..3b0bd664 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,9 +82,4 @@ workflows:
             - DOCKER
       - build_and_push_latest_image:
           context:
-<<<<<<< Updated upstream
-              - DOCKER
-=======
             - DOCKER
-             
->>>>>>> Stashed changes