From 19ee9f50a7d14f48ca993b7c8b21ef4ca3642809 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 10:25:45 +0800
Subject: [PATCH] Merge branch 'feature/vs2019_github_actions' of https://github.com/open-license-manager/open-license-manager into feature/vs2019_github_actions
---
.travis.yml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4353005..db0898b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -209,7 +209,11 @@
echo "Boost already installed"
else
echo "Boost not cached, compiling it"
+<<<<<<< HEAD
wget -q https://versaweb.dl.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.7z
+=======
+ wget -q https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
+>>>>>>> b399ec224144d77d828d877e501331905cf97a70
echo "Boost downloaded"
travis_wait 20 7z x boost_1_68_0.7z -oC:/local
cd "C:/local/boost_1_68_0"
--
Gitblit v1.9.1