Skip to content

Commit cca8db6

Browse files
authored
Merge pull request #14 from MaxFork/master
Conflict in license between python and Markdown
2 parents b773c6d + 649d5d8 commit cca8db6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎settings.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version = 0.0.6
1010
min_python = 3.6
1111
audience = Developers
1212
language = English
13-
license = apache2
13+
license = mit
1414
status = 2
1515
requirements = emoji enlighten py-dashing fastcore ghapi>0.1.9
1616
console_scripts = ghtop=ghtop.ghtop:main

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
setup_cfg = {o:cfg[o] for o in cfg_keys}
1515

1616
licenses = {
17-
'apache2': ('Apache Software License 2.0','OSI Approved :: Apache Software License'),
17+
'mit': ('MIT','OSI Approved :: MIT License'),
1818
}
1919
statuses = [ '1 - Planning', '2 - Pre-Alpha', '3 - Alpha',
2020
'4 - Beta', '5 - Production/Stable', '6 - Mature', '7 - Inactive' ]

0 commit comments

Comments
 (0)