fix(#5219): Solving additional merge conflicts

wazuh · May 3, 2024 · 4da365d · 4da365d
1 parent edb6a61
commit 4da365d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/deployability/modules/testing/tests/helpers/__init__.py b/deployability/modules/testing/tests/helpers/__init__.py
@@ -7,4 +7,4 @@
 from .manager import WazuhManager
 from .indexer import WazuhIndexer
 from .dashboard import WazuhDashboard
-from .central import WazuhCentralComponents
+from .central import WazuhCentralComponents
diff --git a/deployability/modules/testing/tests/helpers/agent.py b/deployability/modules/testing/tests/helpers/agent.py
@@ -359,10 +359,6 @@ def perform_uninstall_and_scan_for_agent(agent_params, wazuh_params) -> None:
 
     @staticmethod
     def assert_results(result, params = None) -> None:
-<<<<<<< HEAD
-=======
-
->>>>>>> 4495-dtt1-release
         """
         Gets the status of an agent given its name.
 

diff --git a/deployability/modules/workflow_engine/examples/manager/aws/dtt1-managers-poc-aws.yaml b/deployability/modules/workflow_engine/examples/manager/aws/dtt1-managers-poc-aws.yaml
@@ -64,4 +64,4 @@ tasks:
           - component: "manager"
           - wazuh-version: "4.7.4"
           - wazuh-revision: "40717"
-          - live: "True"
+          - live: "True"