diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 11:10:09 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-06-06 11:10:09 +0100 |
| commit | ddc219578b572ea3ec41994e163efc66a4d38f31 (patch) | |
| tree | 78a0a94a19d5d3e97236fe4c8b0fd93a36968d8a | |
| parent | Merge branch 'anoa/hs_password_reset_sending_email' into anoa/hs_password_reset (diff) | |
| download | synapse-ddc219578b572ea3ec41994e163efc66a4d38f31.tar.xz | |
fix merge issue
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 429b7bbf47..bb0c5ed97e 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -27,7 +27,6 @@ from synapse.http.servlet import ( assert_params_in_dict, parse_json_object_from_request, ) -from synapse.push.mailer import Mailer, load_jinja2_templates from synapse.util.msisdn import phone_number_to_msisdn from synapse.util.stringutils import random_string from synapse.util.threepids import check_3pid_allowed |