Tue Oct 01 2019 00:35:37 GMT+0700 (SE Asia Standard Time)

2019-10-01 00:35:38 +07:00 · 2019-10-01 00:35:38 +07:00 · 2dcc306bf3
parent 719e6aa132 5878f7528c
commit 2dcc306bf3
1 changed files with 4 additions and 0 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -80,4 +80,8 @@ This work is made available under a Creative Commons Attribution-ShareAlike 4.0
 **Attribution** - You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.

 **ShareAlike** - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+<<<<<<< HEAD
 >>>>>>> 5ca3857cc07f472ae2be563c26847fce995af2c8
+=======
+>>>>>>> 1bcd3bfa8afc3ca2af78b4a96d85797a882c0047
+>>>>>>> 5878f7528c3dd48df564f9e9dc7255d2cb3e1b9d