Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / actions / register.php

diff --git a/actions/register.php b/actions/register.php
index 0ee332f0f24489ec9e9d98b6f75abd2608f78188..45446dce6a71717f066283ae86969a8bdc23e73c 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -68,7 +68,7 @@ class RegisterAction extends Action {
                        if (!$user) {
                                $this->show_form(_t('Invalid username or password.'));
                                return;
-                       }                               
+                       }
                        # success!
                        if (!common_set_user($user)) {
                                common_server_error(_('Error setting user.'));
@@ -82,7 +82,7 @@ class RegisterAction extends Action {
                        }
                        common_redirect(common_local_url('profilesettings'));
                } else {
-                       $this->show_form(_t('Invalid username or password.'));
+                       $this->show_form(_('Invalid username or password.'));
                }
        }