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

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

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index a37ca8c3ff91f1fdf8e9ff303b5ffb9e51466697..fca8a71ea22b765abc37df2bb51be78bbc40b26d 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -64,7 +64,7 @@ class RemotesubscribeAction extends Action {
                $profile = $this->trimmed('profile_url');
                common_show_header(_('Remote subscribe'), NULL, $err,
                                                   array($this, 'show_top'));
-               # id = remotesubscribe conflicts with the 
+               # id = remotesubscribe conflicts with the
                # button on profile page
                common_element_start('form', array('id' => 'remsub', 'method' => 'post',
                                                                                   'action' => common_local_url('remotesubscribe')));