Skip to content
This repository was archived by the owner on Nov 29, 2023. It is now read-only.

Commit 1d2f100

Browse files
committed
Merge remote-tracking branch 'base-sapling/master'
2 parents d9cf5aa + 585da85 commit 1d2f100

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

licenses/sapling-license

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
Copyright (c) 2018 Michael D. Norman, deNormans
1+
Copyright (c) 2020 Michael D. Norman
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
4+
of the Base Sapling (original at https://github.com/mdnorman/base-sapling),
5+
and associated documentation files (the "Base Sapling"), to deal
6+
in the Base Sapling without restriction, including without limitation the rights
67
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8+
copies of the Base Sapling, and to permit persons to whom the Base Sapling is
89
furnished to do so, subject to the following conditions:
910

1011
The above copyright notice and this permission notice shall be included in all
11-
copies or substantial portions of the Software.
12+
copies or substantial portions of the Base Sapling.
1213

13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
THE BASE SAPLING IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1415
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1516
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1617
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1718
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19-
SOFTWARE.
19+
OUT OF OR IN CONNECTION WITH THE BASE SAPLING OR THE USE OR OTHER DEALINGS IN THE
20+
BASE SAPLING.
2021

21-
Except as contained in this notice, the name(s) of the above copyright holders
22-
shall not be used in advertising or otherwise to promote the sale, use or other
23-
dealings in this Software without prior written authorization.
22+
Except as contained in this notice, the name(s) of the above copyright holders
23+
shall not be used in advertising or otherwise to promote the sale, use or other
24+
dealings in this Base Sapling without prior written authorization.

0 commit comments

Comments
 (0)