Commit 47446a38 authored by Türei Dénes's avatar Türei Dénes

auto-license from github merged

parents df87b26e fdc4c361
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment