Skip to content

Commit

Permalink
fix license
Browse files Browse the repository at this point in the history 
Change-Id: I9c46ac21e4101d9ee1ff104d5ce0a9bab84a70b9
  • Loading branch information
alekshaecky committed Oct 30, 2017
1 parent 215f7d9 commit 4a60e00
Showing 1 changed file with 0 additions and 165 deletions.
165 changes: 0 additions & 165 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<<<<<<< HEAD
All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav
and *.ogg) are licensed under the CC BY 4.0 license. All other files are
licensed under the Apache 2 license.
=======
All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav
and *.ogg) are licensed under the CC BY 4.0 license. All other files are
licensed under the Apache 2 license.
>>>>>>> origin/master

=======================================================================

Expand Down Expand Up @@ -214,16 +208,6 @@ Apache License
See the License for the specific language governing permissions and
limitations under the License.

<<<<<<< HEAD
All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav
and *.ogg) are licensed under the CC-BY-NC license. All other files are
licensed under the Apache 2 license.

CC-BY-NC License
----------------

Attribution-NonCommercial-ShareAlike 4.0 International
=======
All image and audio files (including *.png, *.jpg, *.svg, *.mp3, *.wav
and *.ogg) are licensed under the CC BY 4.0 license. All other files are
licensed under the Apache 2 license.
Expand All @@ -232,7 +216,6 @@ CC-BY License
----------------

Attribution 4.0 International
>>>>>>> origin/master

=======================================================================

Expand Down Expand Up @@ -267,11 +250,7 @@ exhaustive, and do not form part of our licenses.
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
<<<<<<< HEAD
wiki.creativecommons.org/Considerations_for_licensors
=======
wiki.creativecommons.org/Considerations_for_licensors
>>>>>>> origin/master

Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
Expand All @@ -287,25 +266,6 @@ exhaustive, and do not form part of our licenses.
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More_considerations
<<<<<<< HEAD
for the public:
wiki.creativecommons.org/Considerations_for_licensees

=======================================================================

Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
Public License

By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution-NonCommercial-ShareAlike 4.0 International Public License
("Public License"). To the extent this Public License may be
interpreted as a contract, You are granted the Licensed Rights in
consideration of Your acceptance of these terms and conditions, and the
Licensor grants You such rights in consideration of benefits the
Licensor receives from making the Licensed Material available under
these terms and conditions.
=======
for the public:
wiki.creativecommons.org/Considerations_for_licensees

Expand All @@ -321,7 +281,6 @@ granted the Licensed Rights in consideration of Your acceptance of
these terms and conditions, and the Licensor grants You such rights in
consideration of benefits the Licensor receives from making the
Licensed Material available under these terms and conditions.
>>>>>>> origin/master


Section 1 -- Definitions.
Expand All @@ -340,47 +299,20 @@ Section 1 -- Definitions.
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.

<<<<<<< HEAD
c. BY-NC-SA Compatible License means a license listed at
creativecommons.org/compatiblelicenses, approved by Creative
Commons as essentially the equivalent of this Public License.

d. Copyright and Similar Rights means copyright and/or similar rights
=======
c. Copyright and Similar Rights means copyright and/or similar rights
>>>>>>> origin/master
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.

<<<<<<< HEAD
e. Effective Technological Measures means those measures that, in the
=======
d. Effective Technological Measures means those measures that, in the
>>>>>>> origin/master
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.

<<<<<<< HEAD
f. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.

g. License Elements means the license attributes listed in the name
of a Creative Commons Public License. The License Elements of this
Public License are Attribution, NonCommercial, and ShareAlike.

h. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.

i. Licensed Rights means the rights granted to You subject to the
=======
e. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
Expand All @@ -390,52 +322,28 @@ Section 1 -- Definitions.
License.

g. Licensed Rights means the rights granted to You subject to the
>>>>>>> origin/master
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.

<<<<<<< HEAD
j. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.

k. NonCommercial means not primarily intended for or directed towards
commercial advantage or monetary compensation. For purposes of
this Public License, the exchange of the Licensed Material for
other material subject to Copyright and Similar Rights by digital
file-sharing or similar means is NonCommercial provided there is
no payment of monetary compensation in connection with the
exchange.

l. Share means to provide material to the public by any means or
=======
h. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.

i. Share means to provide material to the public by any means or
>>>>>>> origin/master
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.

<<<<<<< HEAD
m. Sui Generis Database Rights means rights other than copyright
=======
j. Sui Generis Database Rights means rights other than copyright
>>>>>>> origin/master
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.

<<<<<<< HEAD
n. You means the individual or entity exercising the Licensed Rights
=======
k. You means the individual or entity exercising the Licensed Rights
>>>>>>> origin/master
under this Public License. Your has a corresponding meaning.


Expand All @@ -449,16 +357,9 @@ Section 2 -- Scope.
exercise the Licensed Rights in the Licensed Material to:

a. reproduce and Share the Licensed Material, in whole or
<<<<<<< HEAD
in part, for NonCommercial purposes only; and

b. produce, reproduce, and Share Adapted Material for
NonCommercial purposes only.
=======
in part; and

b. produce, reproduce, and Share Adapted Material.
>>>>>>> origin/master

2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
Expand Down Expand Up @@ -488,17 +389,7 @@ Section 2 -- Scope.
Licensed Rights under the terms and conditions of this
Public License.

<<<<<<< HEAD
b. Additional offer from the Licensor -- Adapted Material.
Every recipient of Adapted Material from You
automatically receives an offer from the Licensor to
exercise the Licensed Rights in the Adapted Material
under the conditions of the Adapter's License You apply.

c. No downstream restrictions. You may not offer or impose
=======
b. No downstream restrictions. You may not offer or impose
>>>>>>> origin/master
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Expand Down Expand Up @@ -530,13 +421,7 @@ Section 2 -- Scope.
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
<<<<<<< HEAD
reserves any right to collect such royalties, including when
the Licensed Material is used other than for NonCommercial
purposes.
=======
reserves any right to collect such royalties.
>>>>>>> origin/master


Section 3 -- License Conditions.
Expand Down Expand Up @@ -581,38 +466,14 @@ following conditions.
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
<<<<<<< HEAD
=======

>>>>>>> origin/master
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.

<<<<<<< HEAD
b. ShareAlike.

In addition to the conditions in Section 3(a), if You Share
Adapted Material You produce, the following conditions also apply.

1. The Adapter's License You apply must be a Creative Commons
license with the same License Elements, this version or
later, or a BY-NC-SA Compatible License.

2. You must include the text of, or the URI or hyperlink to, the
Adapter's License You apply. You may satisfy this condition
in any reasonable manner based on the medium, means, and
context in which You Share Adapted Material.

3. You may not offer or impose any additional or different terms
or conditions on, or apply any Effective Technological
Measures to, Adapted Material that restrict exercise of the
rights granted under the Adapter's License You apply.
=======
4. If You Share Adapted Material You produce, the Adapter's
License You apply must not prevent recipients of the Adapted
Material from complying with this Public License.
>>>>>>> origin/master


Section 4 -- Sui Generis Database Rights.
Expand All @@ -622,22 +483,12 @@ apply to Your use of the Licensed Material:

a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
<<<<<<< HEAD
portion of the contents of the database for NonCommercial purposes
only;
=======
portion of the contents of the database;
>>>>>>> origin/master

b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
<<<<<<< HEAD
Rights (but not its individual contents) is Adapted Material,
including for purposes of Section 3(b); and
=======
Rights (but not its individual contents) is Adapted Material; and
>>>>>>> origin/master

c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
Expand Down Expand Up @@ -738,15 +589,6 @@ Section 8 -- Interpretation.
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.

<<<<<<< HEAD
=======================================================================

Creative Commons is not a party to its public licenses.
Notwithstanding, Creative Commons may elect to apply one of its public
licenses to material it publishes and in those instances will be
considered the "Licensor." Except for the limited purpose of indicating
that material is shared under a Creative Commons public license or as
=======

=======================================================================

Expand All @@ -757,21 +599,14 @@ will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
>>>>>>> origin/master
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
<<<<<<< HEAD
the avoidance of doubt, this paragraph does not form part of the public
licenses.
=======
the avoidance of doubt, this paragraph does not form part of the
public licenses.
>>>>>>> origin/master

Creative Commons may be contacted at creativecommons.org.

0 comments on commit 4a60e00

Please sign in to comment.