diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 98966c384..8eaa96740 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,15 +26,9 @@ Cool? Then, by submitting your first Pull Request, and as a condition of your co "Project IP" includes concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, and works of authorship. -<<<<<<< HEAD -2. **What the Project doesn't own.** If you create IP that doesn't fit into one of the categories listed above, the Project doesn't own it. In other words, the Project doesn't own concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, or works of authorship that you develop, invent, or create that do not meet any of the conditions in Section 1. - -3. **Contribution of your IP to Project projects.** If you include your own IP – such as IP you created prior to working for the Project – into a Project product or service, it's still yours, of course, but you grant the Project a non-exclusive, irrevocable, fully paid-up, royalty-free, perpetual, sublicensable, transferable, worldwide license to use it without restriction in any way or implementation, in modified form, or as is, by itself, or incorporated into another product or service ("License"). If you include your name in any project over which the Project would have rights under this Agreement, such as in a copyright notice or a comment in code or documentation, then the License covers the rights associated with that use of your name as well. -======= 2. **What the Project doesn't own.** If you create IP that doesn't fit into one of the categories listed above, the Project doesn't own it. In other words, the Project doesn't own concepts, designs, developments, discoveries, ideas, improvements, inventions, trade secrets, trademarks, or works of authorship that you develop, invent, or create that do not meet any of the conditions in Section 1. 3. **Contribution of your IP to Project projects.** If you include your own IP � such as IP you created prior to working for the Project � into a Project product or service, it's still yours, of course, but you grant the Project a non-exclusive, irrevocable, fully paid-up, royalty-free, perpetual, sub-licensable, transferable, worldwide license to use it without restriction in any way or implementation, in modified form, or as is, by itself, or incorporated into another product or service ("License"). If you include your name in any project over which the Project would have rights under this Agreement, such as in a copyright notice or a comment in code or documentation, then the License covers the rights associated with that use of your name as well. ->>>>>>> Update license + contributing 4. **Your contributions to non-Project projects.** The Project recognizes that you may be engaged in work that requires you to submit IP to entities other than the Project, such as open source projects used by the Project. Please make sure that Legal is aware of what you're working on so that Legal can help with any licensing issues. If any project asks you to sign a contribution agreement, you should check with Legal before doing so. These agreements may be legally binding on the Project and so should be run through Legal first. @@ -48,8 +42,4 @@ Cool? Then, by submitting your first Pull Request, and as a condition of your co "Confidential Information" includes non-public technical details about our products or services, financial information, business strategies and forecasts, customer data, or any other information, data or know-how that is valuable to the Project because it is not publicly known. -<<<<<<< HEAD The Project's Confidential Information is sensitive and we expect that you'll treat it as such. You agree to only use the Project's Confidential Information for the purpose of performing your contribution and for the benefit of the Project. You will do your best to keep Confidential Information secret. If you are not sure if something is Confidential Information, you should assume that it is, until you can confirm otherwise. -======= - The Project's Confidential Information is sensitive and we expect that you'll treat it as such. You agree to only use the Project's Confidential Information for the purpose of performing your contribution and for the benefit of the Project. You will do your best to keep Confidential Information secret. If you are not sure if something is Confidential Information, you should assume that it is, until you can confirm otherwise. ->>>>>>> Update license + contributing diff --git a/LICENSE b/LICENSE index 8219eca2b..9dc74f24a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,40 +1,22 @@ COPYRIGHT NOTICE -<<<<<<< HEAD -© Copyright 2018 Superalgos.org -======= © Copyright 2019 Superalgos.org ->>>>>>> Update license + contributing LICENSE NOTICE -<<<<<<< HEAD -Superalgos is a collaborative project currently at a very early stage. Because certain aspects of -the project are still not clearly defined, we have chosen to --temporarily-- grant a restrictive -license for the use of this repository, until those aspects are clarified and a proper open source -license can be granted. - -Superalgos.org is publishing the code of this software for several reasons. However, it shall not be considered free software yet. Superalgos is a collaborative project in the crypto space and this -======= Superalgos is a collaborative project currently at a very early stage. Because certain aspects of the project are still not clearly defined, we have chosen to --temporarily-- grant a restrictive license for the use of this repository, until those aspects are clarified and a proper open source license can be granted. Superalgos.org is publishing the code of this software for several reasons. However, it shall not be considered free software yet. Superalgos is a collaborative project in the crypto space and this ->>>>>>> Update license + contributing software is still proprietary software. The reasons for opening up the code of this software at this stage are the following: -<<<<<<< HEAD - * We believe that transparency is paramount to achieving our goals, so we want everyone to - be able to understand what this software does and how. Opening up the code of this software -======= * We believe that transparency is paramount to achieving our goals, so we want everyone to be able to understand what this software does and how. Opening up the code of this software ->>>>>>> Update license + contributing allows anyone to take a close look. * We welcome contributions from the community. Contributions are regarded as voluntary work. @@ -49,18 +31,16 @@ Superalgos.org grants a limited license for the following uses: 1. CODE REVIEW AND AUDITS. You are granted permission to clone this repository to analyze, review or audit the code. -<<<<<<< HEAD -2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository - with the sole purpose of correcting bugs and developing functionality in agreement with - Superalgos.org. By contributing to this repository you explicitely agree to the terms - detailed in CONTRIBUTING.MD. - -PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY. -======= 2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository with the sole purpose of correcting bugs and developing functionality in agreement with Superalgos.org. By contributing to this repository you explicitly agree to the terms detailed in CONTRIBUTING.MD. PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY. ->>>>>>> Update license + contributing + +2. COLLABORATING WITH Superalgos.org. You are granted permission to fork this repository + with the sole purpose of correcting bugs and developing functionality in agreement with + Superalgos.org. By contributing to this repository you explicitly agree to the terms + detailed in CONTRIBUTING.MD. + +PLEASE SEE CONTRIBUTING.MD FOR MORE DETAILS ON THE IMPLICATIONS SURROUNDING YOUR CONTRIBUTIONS TO THIS REPOSITORY.