Skip to content

Commit

Permalink
Fix #31, Updates CLA information for Apache 2.0
Browse files Browse the repository at this point in the history
Deletes old FM CLAs, Removes language in contributing.md of app-specific CLA,
Adds link to new CLAs in pull_request_template
  • Loading branch information
chillfig committed Jun 7, 2022
1 parent 1c1c1ad commit 81cc1ff
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
**Checklist (Please check before submitting)**

* [ ] I reviewed the [Contributing Guide](https://github.com/nasa/FM/blob/main/CONTRIBUTING.md).
* [ ] I signed and emailed the appropriate Contributor License agreement to [email protected] and copied [email protected].
* [ ] I signed and emailed the appropriate [Contributor License Agreement](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md#contributor-license-agreement-cla) to [email protected] and copied [email protected].

**Describe the contribution**
A clear and concise description of what the contribution is.
Expand Down
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Contributing Guide

## Contributor License Agreement (CLA)
The CLA forms are currently unique to this app.
Sign and email the appropriate Contributor License agreement below to [email protected] and copy [email protected]
* Corporate Contributor License agreement : https://github.com/nasa/FM/blob/main/docs/Corp_CLA_FM_260.pdf
* Individual Contributor License agreement : https://github.com/nasa/FM/blob/main/docs/Indv_CLA_FM_260.pdf
* cFS Apps Corporate Contributor License agreement : https://github.com/nasa/cFS/blob/main/cFS_Apps_Corporate_CLA.pdf
* cFS Apps Individual Contributor License agreement : https://github.com/nasa/cFS/blob/main/cFS_Apps_Individual_CLA.pdf

Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute.
Binary file removed docs/Corp_CLA_FM_260.pdf
Binary file not shown.
Binary file removed docs/Indv_CLA_FM_260.pdf
Binary file not shown.

0 comments on commit 81cc1ff

Please sign in to comment.