From ad38f2f9772b765e7a060351c5d96751c2cc8fd2 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 | 2 --
 1 file changed, 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
-- 
cgit v1.2.1