Thu Jun 30 2016 23:18:33 GMT+0100 (W. Central Africa Standard Time)

This commit is contained in:
Pungs6TH16 2016-06-30 23:18:32 +01:00
parent 68e229367b
commit 0f89e007f1
2 changed files with 1 additions and 19 deletions

View File

@ -1,20 +1,3 @@
<<<<<<< HEAD
## License:
This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
### You are free to:
**Share** - copy and redistribute the material in any medium or format
**Adapt** - remix, transform, and build upon the material for any purpose, even commercially.
### Under the following conditions:
**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.
=======
## License
This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
@ -30,4 +13,3 @@ 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.
>>>>>>> refs/heads/new