From 2c8ec69863dc8e8b4a4259768a9fb427f1b9a26d Mon Sep 17 00:00:00 2001
From: anvitha-jain <anvithjain@gmail.com>
Date: Wed, 13 Mar 2024 12:42:20 -0700
Subject: [PATCH] [ignore] Rebased to current master Mar 13 2024.

---
 plugins/module_utils/aci.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/module_utils/aci.py b/plugins/module_utils/aci.py
index 28e3e4ef4..d567089c6 100644
--- a/plugins/module_utils/aci.py
+++ b/plugins/module_utils/aci.py
@@ -1673,7 +1673,6 @@ def dump_json(self):
                     if self.result.get("changed") is True:
                         json.dump([mo], output_file)
 
-<<<<<<< HEAD
     def parsed_url_path(self, url):
         if not HAS_URLPARSE:
             self.fail_json(msg="urlparse is not installed")