gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ops

Browse Source
This commit is contained in:
John ShaggyTwoDope Jenkins
2015-09-23 05:56:35 -07:00
parent e1098273c4
commit 041b6e745a
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MANIFEST.in
View File

@@ -1,7 +1,4 @@
include version.py include version.py
include CHANGELOG.rst CONTRIBUTORS.rst LICENSE include CHANGELOG.rst CONTRIBUTORS.rst LICENSE
<<<<<<< HEAD
include rtv.1 include rtv.1
=======
include rtv/templates/* include rtv/templates/*
>>>>>>> 28d17b28d0840f75386586686897e9316378150e

4
setup.py
View File

@@ -21,12 +21,8 @@ setup(
keywords='reddit terminal praw curses', keywords='reddit terminal praw curses',
packages=['rtv'], packages=['rtv'],
include_package_data=True, include_package_data=True,
<<<<<<< HEAD
data_files=[("share/man/man1", ["rtv.1"])], data_files=[("share/man/man1", ["rtv.1"])],
install_requires=['praw>=3.1.0', 'six', 'requests', 'kitchen'],
=======
install_requires=requirements, install_requires=requirements,
>>>>>>> 28d17b28d0840f75386586686897e9316378150e
entry_points={'console_scripts': ['rtv=rtv.__main__:main']}, entry_points={'console_scripts': ['rtv=rtv.__main__:main']},
classifiers=[ classifiers=[
'Intended Audience :: End Users/Desktop', 'Intended Audience :: End Users/Desktop',