kikobar/fablab-docs
1
0
Fork 0
mirror of https://github.com/fablabsg/fablab-docs.git synced 2024-11-16 09:52:13 +00:00
Code Issues Actions Packages Projects Releases 2 Wiki Activity

Fix licese incompatibility

Browse source
This commit is contained in:
Enrique Barcelli 2024-09-07 15:13:35 +08:00
parent 935cbb391f
commit 5655c0de00
Signed by: kikobar
GPG key ID: 006C13A68E25D3B7
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LICENSE.md
View file

@ -22,7 +22,7 @@ SOFTWARE.
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
### CC BY-SA 4.0 - ATTRIBUTION-SHAREALIKE 4.0 INTERNATIONAL ### CC BY 4.0 - ATTRIBUTION 4.0 INTERNATIONAL
#### You are free to: #### You are free to:
@ -38,8 +38,6 @@ The licensor cannot revoke these freedoms as long as you follow the license term
**Attribution** — You must give [appropriate credit](https://creativecommons.org/licenses/by-sa/4.0/#ref-appropriate-credit) , provide a link to the license, and [indicate if changes were made](https://creativecommons.org/licenses/by-sa/4.0/#ref-indicate-changes) . You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use. **Attribution** — You must give [appropriate credit](https://creativecommons.org/licenses/by-sa/4.0/#ref-appropriate-credit) , provide a link to the license, and [indicate if changes were made](https://creativecommons.org/licenses/by-sa/4.0/#ref-indicate-changes) . You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
**ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the [same license](https://creativecommons.org/licenses/by-sa/4.0/#ref-same-license) as the original.
**No additional restrictions** — You may not apply legal terms or [technological measures](https://creativecommons.org/licenses/by-sa/4.0/#ref-technological-measures) that legally restrict others from doing anything the license permits. **No additional restrictions** — You may not apply legal terms or [technological measures](https://creativecommons.org/licenses/by-sa/4.0/#ref-technological-measures) that legally restrict others from doing anything the license permits.
#### Notices: #### Notices:

2
MOU.md
View file

@ -71,7 +71,7 @@ both ow whom are collectively known as the "Parties",
Where the parties deem it fit, helpful or convenient, by common decision or consensus, individuals and entities from the private, public, academic, research, and other sectors may be invited to support the cooperative activities described herein, provided that they can directly and meaningfully contribute to the achievement of the objectives of this MOU. Where the parties deem it fit, helpful or convenient, by common decision or consensus, individuals and entities from the private, public, academic, research, and other sectors may be invited to support the cooperative activities described herein, provided that they can directly and meaningfully contribute to the achievement of the objectives of this MOU.
8. **Intellectual Property / Publishing Rights.** 8. **Intellectual Property / Publishing Rights.**
All intellectual property rights in all material (including but not limited to reports, data, designs whether or not electronically stored) produced by the parties pursuant to the performance of the services shall be the property of the respective party in the memorandum generating them unless otherwise agreed expressly in writing, and communicated to the parties in the memorandum.<br>In accordance to the overall licensing policy of the project, the parties shall license all the said material under the MIT or CC BY-SA 4.0 license. All intellectual property rights in all material (including but not limited to reports, data, designs whether or not electronically stored) produced by the parties pursuant to the performance of the services shall be the property of the respective party in the memorandum generating them unless otherwise agreed expressly in writing, and communicated to the parties in the memorandum.<br>In accordance to the overall licensing policy of the project, the parties shall license all the said material under the MIT or CC BY 4.0 license.
9. **Conflict of interest.** 9. **Conflict of interest.**
Each party confirms that no conflict of interest exists or is likely to arise in relation to the performance of its obligations under this MOU and will endeavor to ensure that no such conflict of interest arises. Each party agrees to immediately notify the other party if such a conflict arises or is likely to arise in which case the parties will deliberate and agree on the necessary action(s) to ensure the resolution or avoidance of the conflict of interest. Each party confirms that no conflict of interest exists or is likely to arise in relation to the performance of its obligations under this MOU and will endeavor to ensure that no such conflict of interest arises. Each party agrees to immediately notify the other party if such a conflict arises or is likely to arise in which case the parties will deliberate and agree on the necessary action(s) to ensure the resolution or avoidance of the conflict of interest.