summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/build_win32.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/build_win32.sh b/scripts/build_win32.sh
index f398df6c8..ce0ec0c07 100644
--- a/scripts/build_win32.sh
+++ b/scripts/build_win32.sh
@@ -2,8 +2,6 @@
set -e
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