diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:24:46 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-27 09:24:46 +0100 |
| commit | df18e6c8b434dfd86177cf5041278fd46d6d2ea7 (patch) | |
| tree | de6577e77e9f169a2f0228653b9799303afd5a7d /perllib/FixMyStreet/DB/Result/User.pm | |
| parent | b483a17c13ba8e273949ce4ee8c8c05e66b06647 (diff) | |
remove merge cruft
Diffstat (limited to 'perllib/FixMyStreet/DB/Result/User.pm')
| -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; |