Skip to content

Commit 4c33b1b

Browse files
Merge pull request #751 from lorenzwalthert/issue-690
- Switch to MIT Licence (#751).
2 parents 5957df1 + d89e3fc commit 4c33b1b

File tree

5 files changed

+28
-1
lines changed

5 files changed

+28
-1
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ revdep
2020
^\.github/$
2121
^touchstone$
2222
^\.github$
23+
^LICENSE\.md$

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Authors@R:
1313
email = "[email protected]"))
1414
Description: Pretty-prints R code without changing the user's formatting
1515
intent.
16-
License: GPL-3
16+
License: MIT + file LICENSE
1717
URL: https://github.com/r-lib/styler, https://styler.r-lib.org
1818
BugReports: https://github.com/r-lib/styler/issues
1919
Imports:

LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
YEAR: 2021
2+
COPYRIGHT HOLDER: styler authors

LICENSE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# MIT License
2+
3+
Copyright (c) 2021 styler authors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

inst/WORDLIST

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@ lst
9999
macOS
100100
magrittr
101101
md
102+
MERCHANTABILITY
102103
Müller
103104
mutli
104105
na
105106
navbar
106107
netlify
108+
NONINFRINGEMENT
107109
NUM
108110
oldrel
109111
os
@@ -186,6 +188,7 @@ stylerignore
186188
stylerignored
187189
stylers
188190
subexpr
191+
sublicense
189192
sudo
190193
summarises
191194
Sys

0 commit comments

Comments
 (0)