Merge conflicts

2016-07-18 16:18:33 -05:00
parent 022dd7e449 bf59214de0
commit c8ff233c7c
1 changed files with 1 additions and 0 deletions
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -223,6 +223,7 @@ def subreddit_page(reddit, terminal, config, oauth):
 def list_reddits_page(reddit, terminal, config, oauth):
    title = 'Popular Subreddits'
    func = reddit.get_popular_subreddits
+
    with terminal.loader():
        page = ListRedditsPage(reddit, title, func, terminal, config, oauth)
    assert terminal.loader.exception is None