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 ++++
doc/development/Build-the-library-windows.rst | 1 -
README.md | 5 +++++
3 files changed, 9 insertions(+), 1 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"
diff --git a/README.md b/README.md
index e855347..881f44d 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,14 @@
A comprehensive [list of features](http://open-license-manager.github.io/open-license-manager/analysis/features.html), and their status is available in the project site.
+<<<<<<< HEAD
If you're experiencing problems, or you just need informations you can't find in the [documentation](http://open-license-manager.github.io/open-license-manager) please contact us on the [user forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), we'll be happy to help.
Remember to show your appreciation giving us a <a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
+=======
+If you plan to use this library or part of it remember to show us your appreciation giving it a
+<a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
+>>>>>>> b399ec224144d77d828d877e501331905cf97a70
## License
The project is donated to the community. It comes with a very large freedom of use for everyone, and it will always be.
diff --git a/doc/development/Build-the-library-windows.rst b/doc/development/Build-the-library-windows.rst
index df72443..c689b09 100644
--- a/doc/development/Build-the-library-windows.rst
+++ b/doc/development/Build-the-library-windows.rst
@@ -139,4 +139,3 @@
-
--
Gitblit v1.9.1