auto-license from github merged

47446a38 · Türei Dénes · df87b26e · fdc4c361 · 47446a38
Commit 47446a38 authored Sep 14, 2017 by Türei Dénes
--- a/LICENSE
+++ b/LICENSE
@@ -672,4 +672,7 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<<<<<<< HEAD

+=======
+>>>>>>> fdc4c3613207e2002d3cb2d1446a1442dbbde605