From 8067634447b54981fdad6140737e9f3c220b7b2f Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 10 Jan 2020 16:16:11 +0000 Subject: [PATCH] Fix merge conflict --- tests/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index cc5e1b3f8..0d31001ac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1791,7 +1791,6 @@ def mock_get_notifications( return notification_json( service_id, template=template, - to=to, rows=rows, job=job, with_links=True if count_pages is None else count_pages,