From 28e918be1837a1a64d6d373e477b7d39131eb243 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Mon, 29 Jan 2024 11:22:41 -0600
Subject: [PATCH] fix

---
 .jenkins_linux_builds | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.jenkins_linux_builds b/.jenkins_linux_builds
index 2cdad66e..0d7abc97 100644
--- a/.jenkins_linux_builds
+++ b/.jenkins_linux_builds
@@ -68,10 +68,7 @@ pipeline {
       agent {
         dockerfile {
           filename 'mingw64'
-<<<<<<< HEAD
-=======
           additionalBuildArgs '--build-arg NUM_JOBS=8'
->>>>>>> 6ecad9af72106de84ac2984785f3838d7391ffca
           dir 'docker/64_bit'
         }
       }