diff options
-rw-r--r-- | perllib/FixMyStreet/DB/Result/User.pm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index c0b078775..c7e5e94af 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -62,7 +62,6 @@ __PACKAGE__->add_columns( encode_check_method => 'check_password', }, ); ->>>>>>> 62ffebc89cc66d32a828ea1de8c850c3e950faa1 use mySociety::EmailUtil; |