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

[quix0rs-gnu-social.git] / lib / stream.php

diff --git a/lib/stream.php b/lib/stream.php
index a908b48e8a6bb5be139e742cddbff2ae03ea1e0f..d6180f4edde0226d52f7e6926c7fa52c8203bd60 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -101,7 +101,7 @@ class StreamAction extends Action {
                                                   _t(' in reply to...'));
                        common_text(')');
                }
-               common_element_start('a', 
+               common_element_start('a',
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
                                                                   'onclick' => 'doreply("'.$profile->nickname.'"); return false',