sixam/minetest
Template
2
0
Fork 0
mirror of https://github.com/luanti-org/minetest_game.git synced 2025-05-28 17:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflict

Browse source
This commit is contained in:
An0n3m0us 2019-12-16 10:51:16 +00:00
parent 81bc9b43e6
commit 2f7db9c81d
1 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
mods/player_api/license.txt
View file

@ -22,7 +22,6 @@ Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
Copyright (C) 2011-2018 celeron55, Perttu Ahola <celeron55@gmail.com>
Copyright (C) 2012-2018 Jordach
Copyright (C) 2018 stujones11
Copyright (C) 2018 paramat
Copyright (C) 2019 An0n3m0us
You are free to:
@ -52,34 +51,3 @@ rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by-sa/3.0/
------------------------------------
Attribution 3.0 Unported (CC BY 3.0)
Copyright (C) 2014-2018 sonictechtonic
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.
The licensor cannot revoke these freedoms as long as you follow the license terms.
Under the following terms:
Attribution — You must give appropriate credit, provide a link to the license, and
indicate if changes were made. You may do so in any reasonable manner, but not in any way
that suggests the licensor endorses you or your use.
No additional restrictions — You may not apply legal terms or technological measures that
legally restrict others from doing anything the license permits.
Notices:
You do not have to comply with the license for elements of the material in the public
domain or where your use is permitted by an applicable exception or limitation.
No warranties are given. The license may not give you all of the permissions necessary
for your intended use. For example, other rights such as publicity, privacy, or moral
rights may limit how you use the material.
For more details:
http://creativecommons.org/licenses/by/3.0/