From b2205d39d2864f4ed7fd3d931b2e6b8f06a6b38b Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Mon, 20 May 2019 20:54:35 +0200
Subject: fix

---
 scripts/build_win32.sh | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh
index 7e39c3b8d..ce0ec0c07 100644
--- a/scripts/build_win32.sh
+++ b/scripts/build_win32.sh
@@ -1,24 +1,15 @@
 #!/usr/bin/env bash
 set -e
-<<<<<<< HEAD
-
 apt-get update && apt-get install -y mingw-w64 mingw-w64-tools  \
   default-jdk nsis libsaxonb-java curl
-=======
->>>>>>> Refactoring:mingw:simplify toolchain
 
 mkdir win32
 pushd win32
 
-<<<<<<< HEAD
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \
-  -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ..
-=======
 cmake -DTARGET_ARCH=i686-w64-mingw32 -DCMAKE_SYSTEM_NAME=Windows \
   -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n \
   -DXSLTS=windows -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw.cmake ..
 
->>>>>>> Refactoring:mingw:simplify toolchain
 make -j $(nproc --all)
 make -j $(nproc --all) package
 
-- 
cgit v1.2.1