From 5fdda051277357d4e2e3f6280d522031c065d40a Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 20 Dec 2024 15:30:25 -0330
Subject: [PATCH] Fix merge conflict

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5363d667bf86..f800ab484ebe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,8 +123,6 @@ workflows:
                 - master
           requires:
             - prep-deps
-          requires:
-            - prep-deps
       - prep-build-mmi:
           requires:
             - prep-deps