Merge branch 'rewrites-master/type-hints-asserts' into rewrites-nightly/type-hints...

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

diff --git a/actions/replies.php b/actions/replies.php
index 5bf2f8edc429bb4829f0966c82053fccb7576045..ce65fef7a9fbe497aef387b80c1507da0b2d067e 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -74,26 +74,6 @@ class RepliesAction extends ManagedAction
             // TRANS: Client error when page not found (404)
             $this->clientError(_('No such page.'), 404);
         }
-<<<<<<< HEAD
-
-        return true;
-    }
-
-    /**
-     * Handle a request
-     *
-     * Just show the page. All args already handled.
-     *
-     * @param array $args $_REQUEST data
-     *
-     * @return void
-     */
-    function handle(array $args=array())
-    {
-        parent::handle($args);
-        $this->showPage();
-=======
->>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
     }
 
     /**