Fix rebase conflicts

2019-06-10 15:33:30 -04:00
parent 5339fd34d5
commit 40b599d1d0
4 changed files with 6 additions and 6 deletions
--- a/tests/routes/task_orders/test_downloads.py
+++ b/tests/routes/task_orders/test_downloads.py
@@ -18,7 +18,7 @@ def xml_translated(val):
 def test_download_summary(client, user_session):
    user = UserFactory.create()
    portfolio = PortfolioFactory.create(owner=user)
-    task_order = TaskOrderFactory.create(creator=user, portfolio=portfolio)
+    task_order = TaskOrderFactory.create(creator=user, portfolio=portfolio, _pdf=None)
    user_session(user)
    response = client.get(
        url_for("task_orders.download_summary", task_order_id=task_order.id)