summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBignaux Ronan <ronan@aimao.org>2019-05-20 20:54:35 +0200
committerjkoan <jkoan@gmx.de>2019-05-25 10:58:50 +0200
commitad38f2f9772b765e7a060351c5d96751c2cc8fd2 (patch)
treea289e43fba3de351351fd8d7e78b40b4bbdc23cd
parent9988b45c473bb4d10af678995586ad4348191198 (diff)
downloadnavit-sync_bookmarks.tar.gz
-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