module/open-license-manager.git

			@@ -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"

			@@ -17,14 +17,9 @@

			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.
			@@ -98,8 +93,7 @@

			## How to contribute

			The easiest way you can solve your problems or ask help is through the [forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google),
			otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/open-license-manager/issues).
			The easiest way you can solve your problems or ask help is through the [forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/open-license-manager/issues).
			Have a look to the [contribution guidelines](CONTRIBUTING.md) before reporting.
			We use [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) (or at least a subset of it).
			Remember to install the gitflow git plugin and use `develop` as default branch for your pull requests.

	.travis.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	README.md	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史