fix last bad commit

openMF · Aug 9, 2023 · feeeaed · feeeaed
1 parent 22d91b1
commit feeeaed
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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