iskm/wordfreq
1
0
Fork 0
mirror of https://github.com/rspeer/wordfreq.git synced 2024-12-23 17:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge conflict markers in setup

Browse Source
This commit is contained in:
Elia Robyn Speer 2021-09-02 21:49:49 +00:00
parent b60ac1b803
commit 2361606b3a
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup.py
View File

@ -28,20 +28,12 @@ README_contents = open(os.path.join(current_dir, 'README.md'),
encoding='utf-8').read() encoding='utf-8').read()
doclines = README_contents.split("\n") doclines = README_contents.split("\n")
dependencies = [ dependencies = [
<<<<<<< HEAD
'msgpack >= 1.0', 'langcodes >= 3.0', 'regex >= 2020.04.04', 'ftfy >= 3.0' 'msgpack >= 1.0', 'langcodes >= 3.0', 'regex >= 2020.04.04', 'ftfy >= 3.0'
=======
'msgpack >= 1.0', 'langcodes >= 2.1', 'regex >= 2020.04.04'
>>>>>>> origin/apostrophe-consistency
] ]
setup( setup(
name="wordfreq", name="wordfreq",
<<<<<<< HEAD
version='2.5.1', version='2.5.1',
=======
version='2.3.3',
>>>>>>> origin/apostrophe-consistency
maintainer='Robyn Speer', maintainer='Robyn Speer',
maintainer_email='rspeer@arborelia.net', maintainer_email='rspeer@arborelia.net',
url='http://github.com/LuminosoInsight/wordfreq/', url='http://github.com/LuminosoInsight/wordfreq/',