Skip to content

Commit 7df10e6

Browse files
authored
Merge pull request #177 from artagnon/license-cleanup
[LICENSE] Collapse duplicates, modernize
2 parents d533b64 + ca7ce14 commit 7df10e6

File tree

5 files changed

+13
-48
lines changed

5 files changed

+13
-48
lines changed

client/License.txt LICENSE

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
Copyright (c) Christian J. Bell
2-
3-
All rights reserved.
4-
5-
MIT License
1+
Copyright (c) Christian J. Bell and contributors
62

73
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
84

9-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
5+
The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
106

11-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

License.txt

-17
This file was deleted.

server/License.txt

-11
This file was deleted.

server/README.md

-3
This file was deleted.

server/ThirdPartyNotices.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
22
For Microsoft vscode-languageserver-node-example
3-
3+
44
This project incorporates material from the project(s) listed below (collectively, “Third Party Code”).
5-
Microsoft is not the original author of the Third Party Code. The original copyright notice and license
6-
under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed
7-
to you under their original license terms set forth below. Microsoft reserves all other rights not expressly
5+
Microsoft is not the original author of the Third Party Code. The original copyright notice and license
6+
under which Microsoft received such Third Party Code are set out below. This Third Party Code is licensed
7+
to you under their original license terms set forth below. Microsoft reserves all other rights not expressly
88
granted, whether by implication, estoppel or otherwise.
9-
9+
1010
1. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped)
11-
11+
1212
This project is licensed under the MIT license.
1313
Copyrights are respective of each contributor listed at the beginning of each definition file.
14-
14+
1515
Permission is hereby granted, free of charge, to any person obtaining a copy
1616
of this software and associated documentation files (the "Software"), to deal
1717
in the Software without restriction, including without limitation the rights
1818
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1919
copies of the Software, and to permit persons to whom the Software is
2020
furnished to do so, subject to the following conditions:
21-
21+
2222
The above copyright notice and this permission notice shall be included in
2323
all copies or substantial portions of the Software.
24-
24+
2525
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2626
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2727
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2828
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2929
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3030
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
31-
THE SOFTWARE.
31+
THE SOFTWARE.

0 commit comments

Comments
 (0)