Resolve conflicts

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

diff --git a/actions/allrss.php b/actions/allrss.php
index b6701cfdc7e4d9f4bd87be81d90e6acdf2aca776..9cbfe8dc8f2c58b5d4829bc8b7433cc039c8f891 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -45,10 +45,6 @@ class AllrssAction extends Rss10Action {
                
                $notice = $user->noticesWithFriends(0, $limit);
                                                                                        
-               # XXX: revisit constant scope
-               
-               $cnt = $notice->find();
-
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }