From 6b36bab4cd66d486e57962972bf871fb003c2aa2 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 25 Dec 2025 17:27:18 +0900
Subject: [PATCH] Removed env variables for arch for Windows images

---
 Dockerfiles/build-base/windows/Dockerfile.agent2 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Dockerfiles/build-base/windows/Dockerfile.agent2 b/Dockerfiles/build-base/windows/Dockerfile.agent2
index ddc3617d4..788aa1ea6 100644
--- a/Dockerfiles/build-base/windows/Dockerfile.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile.agent2
@@ -10,15 +10,8 @@ ARG PWSH_VERSION=7.5.4
 
 ARG MSYSTEM=UCRT64
 
-<<<<<<< HEAD
-ARG BUILD_ARCH=x64
-
 ARG MAJOR_VERSION=7.0
 ARG ZBX_VERSION=${MAJOR_VERSION}.22
-=======
-ARG MAJOR_VERSION=7.4
-ARG ZBX_VERSION=${MAJOR_VERSION}.6
->>>>>>> 78ce5093c (Removed env variables for arch for Windows images)
 
 FROM ${OS_BASE_IMAGE} as src