summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE1
1 files changed, 1 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index d7f1051..458fa7c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -337,3 +337,4 @@ proprietary programs. If your program is a subroutine library, you 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.
+>>>>>>> b0d8f2c999236474d0101819b8ec5dc514b73ccf