Skip to content

Commit

Permalink
Fix CLA
Browse files Browse the repository at this point in the history
I had messed up the generation of it, then didn't read it carefully -- there were values missing from it.
  • Loading branch information
adam-p committed Oct 27, 2017
1 parent c35f2e0 commit 5bb51a2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
11 changes: 6 additions & 5 deletions CLA-entity.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Markdown Here Entity Contributor License Agreement

Thank you for your interest in contributing to Markdown Here ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement.
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement, following the instructions at https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md.

This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

## 1. Definitions

"You" means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.

"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in .
"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md.

"Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.

Expand Down Expand Up @@ -55,7 +55,7 @@ You confirm that:

(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties.

(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted.
(d) You have followed the instructions in https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md, if You do not own the Copyright in the entire work of authorship Submitted.

## 4. Disclaimer

Expand All @@ -67,7 +67,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

## 6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
6.1 This Agreement will be governed by and construed in accordance with the laws of Canada excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.

Expand All @@ -77,6 +77,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.

This agreement is derived from the Project Harmony CLA generator:
This agreement is derived from the Project Harmony CLA generator:
http://www.harmonyagreements.org/

Harmony (HA-CLA-E-ANY) Version 1.0
12 changes: 6 additions & 6 deletions CLA-individual.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Markdown Here Individual Contributor License Agreement

Thank you for your interest in contributing to Markdown Here ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement.
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement, following the instructions at https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md.

This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

## 1. Definitions

"You" means the individual who Submits a Contribution to Us.

"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in .
"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md.

"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.

Expand Down Expand Up @@ -55,7 +55,7 @@ You confirm that:

(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.

(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted.
(d) You have followed the instructions in https://github.com/adam-p/markdown-here/blob/master/CONTRIBUTING.md, if You do not own the Copyright in the entire work of authorship Submitted.

## 4. Disclaimer

Expand All @@ -67,7 +67,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

## 6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
6.1 This Agreement will be governed by and construed in accordance with the laws of Canada excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.

Expand All @@ -77,7 +77,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.

This agreement is derived from the Project Harmony CLA generator:
This agreement is derived from the Project Harmony CLA generator:
http://www.harmonyagreements.org/
Harmony (HA-CLA-I-ANY) Version 1.0

Harmony (HA-CLA-I-ANY) Version 1.0
4 changes: 2 additions & 2 deletions contributors/adam-p.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
2014-12-08
2017-10-27

I hereby agree to the terms of the "Markdown Here Individual Contributor License Agreement", with MD5 checksum 20a56153709a38a23316feb565f80756.
I hereby agree to the terms of the "Markdown Here Individual Contributor License Agreement", with MD5 checksum 5a845d3ba953b0be7e01fa276c3459e6.

I furthermore declare that I am authorized and able to make this agreement and sign this declaration.

Expand Down

0 comments on commit 5bb51a2

Please sign in to comment.