Merge branch 'testing'

This commit is contained in:
mousebot 2020-04-24 20:00:36 -03:00
commit 66d75580e4
1 changed files with 4 additions and 0 deletions

View File

@ -7,7 +7,11 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
long_description = f.read()
setup(name='mkv-this',
<<<<<<< HEAD
version='0.1.33',
=======
version='0.1.34',
>>>>>>> testing
description='cli wrapper for markovify: take a text file or URL, markovify, save the results.',
long_description=long_description,
long_description_content_type='text/markdown',