From fc059acc0101b45b91be98256289c4060df8e30e Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 22:08:08 +0800
Subject: [PATCH] update boost download address

---
 .travis.yml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index db0898b..4353005 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -209,11 +209,7 @@
                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