Skip to content

Commit 3d23db1

Browse files
authored
Compromise license patch 1 (#13)
* Proposed compromise amendment to license file: (Change "and" to "and/or" in response to discussions in issue #5 #5 ) * Final Version of proposal for review in Issue #5 (#1) Inc changes from prev commit: https://github.com/Daasin/kerla/commit/c8df66ec48be5f3dff259db6023b99db3df0d01f
1 parent 8895427 commit 3d23db1

File tree

1 file changed

+37
-29
lines changed

1 file changed

+37
-29
lines changed

LICENSE.md

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,40 @@
11
# License
22

3-
This software is dual-licensed: Apache license version 2.0 and MIT license.
3+
This software is dual-licensed: MIT license and/or Apache license version 2.0 .
4+
5+
6+
## MIT license
7+
8+
```
9+
Permission is hereby granted, free of charge, to any
10+
person obtaining a copy of this software and associated
11+
documentation files (the "Software"), to deal in the
12+
Software without restriction, including without
13+
limitation the rights to use, copy, modify, merge,
14+
publish, distribute, sublicense, and/or sell copies of
15+
the Software, and to permit persons to whom the Software
16+
is furnished to do so, subject to the following
17+
conditions:
18+
19+
The above copyright notice and this permission notice
20+
shall be included in all copies or substantial portions
21+
of the Software.
22+
23+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
24+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
25+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
26+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
27+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
29+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
30+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
31+
DEALINGS IN THE SOFTWARE.
32+
```
33+
34+
35+
###### **_and/or_**
36+
37+
438

539
## Apache license version 2.0
640

@@ -182,31 +216,5 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
182216
183217
END OF TERMS AND CONDITIONS
184218
```
185-
186-
## MIT license
187-
188-
```
189-
Permission is hereby granted, free of charge, to any
190-
person obtaining a copy of this software and associated
191-
documentation files (the "Software"), to deal in the
192-
Software without restriction, including without
193-
limitation the rights to use, copy, modify, merge,
194-
publish, distribute, sublicense, and/or sell copies of
195-
the Software, and to permit persons to whom the Software
196-
is furnished to do so, subject to the following
197-
conditions:
198-
199-
The above copyright notice and this permission notice
200-
shall be included in all copies or substantial portions
201-
of the Software.
202-
203-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
204-
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
205-
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
206-
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
207-
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
208-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
209-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
210-
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
211-
DEALINGS IN THE SOFTWARE.
212-
```
219+
---
220+

0 commit comments

Comments
 (0)