From d45e2d984e6ef583ea6d43cd266545ed65bd4adb Mon Sep 17 00:00:00 2001
From: vcerenu <victor.erenu@wazuh.com>
Date: Mon, 23 Oct 2023 05:27:21 -0300
Subject: [PATCH] resolving conflicts

---
 build-docker-images/wazuh-manager/Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile
index e3c6b426..878a07a2 100644
--- a/build-docker-images/wazuh-manager/Dockerfile
+++ b/build-docker-images/wazuh-manager/Dockerfile
@@ -5,11 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
-<<<<<<< HEAD
 ARG FILEBEAT_TEMPLATE_BRANCH
-=======
-ARG TEMPLATE_VERSION=v4.7.1
->>>>>>> aa88dad36ac99f8a1b1470a8c1b4749a80157d7e
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
 ARG WAZUH_FILEBEAT_MODULE