fix

2024-01-29 11:22:41 -06:00
parent b4403ff959
commit 28e918be18
1 changed files with 0 additions and 3 deletions
--- 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'
        }
      }