ops

2015-09-23 05:56:35 -07:00
parent e1098273c4
commit 041b6e745a
2 changed files with 0 additions and 7 deletions
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,8 @@ setup(
    keywords='reddit terminal praw curses',
    packages=['rtv'],
    include_package_data=True,
-<<<<<<< HEAD
    data_files=[("share/man/man1", ["rtv.1"])],
-    install_requires=['praw>=3.1.0', 'six', 'requests', 'kitchen'],
-=======
    install_requires=requirements,
->>>>>>> 28d17b28d0840f75386586686897e9316378150e
    entry_points={'console_scripts': ['rtv=rtv.__main__:main']},
    classifiers=[
        'Intended Audience :: End Users/Desktop',