From f5de80f1956c9c55bc5cb83785a4434b95c5ee4e Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 7 Nov 2018 16:39:04 +0000 Subject: [PATCH] Fix conflict --- requirements.txt | 2 -- tests/app/template/test_rest.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index c68365b0a..7388d5cee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,6 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 alembic==1.0.2 amqp==1.4.9 anyjson==0.3.3 -attrs==18.2.0 awscli==1.16.49 bcrypt==3.1.4 billiard==3.3.0.23 @@ -68,7 +67,6 @@ phonenumbers==8.9.4 pyasn1==0.4.4 pycparser==2.19 PyPDF2==1.26.0 -pyrsistent==0.14.5 python-dateutil==2.7.5 python-editor==1.0.3 python-json-logger==0.1.8 diff --git a/tests/app/template/test_rest.py b/tests/app/template/test_rest.py index 6cd9950b0..d3de8e3d5 100644 --- a/tests/app/template/test_rest.py +++ b/tests/app/template/test_rest.py @@ -302,7 +302,7 @@ def test_must_have_a_subject_on_an_email_or_letter_template(client, sample_user, def test_update_should_update_a_template(client, sample_user, sample_template): data = { 'content': 'my template has new content ', - 'created_by_id': str(sample_user.id) + 'created_by': str(sample_user.id) } data = json.dumps(data) auth_header = create_authorization_header()