Skip to content

Commit

Permalink
resolving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcerenu
vcerenu committed Oct 23, 2023
1 parent 781e6a4 commit d45e2d9
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions build-docker-images/wazuh-manager/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d45e2d9

Please sign in to comment.