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

---
 README.md |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

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. 

--
Gitblit v1.9.1