added missing curly braces

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index 7662289ad255e1f0d0e50d8276b296eeca8e33e2..7dd7df2f5ad47fadf6d74702732b757866841903 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,6 +1,6 @@
 <?php
 
-function filerm_content(App &$a) {
+function filerm_content(App $a) {
 
        if (! local_user()) {
                killme();
@@ -22,14 +22,9 @@ function filerm_content(App &$a) {
                file_tag_unsave_file(local_user(),$item_id,$term, $category);
        }
 
-<<<<<<< upstream/develop
        if (x($_SESSION,'return_url')) {
                goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
        }
-=======
-       if(x($_SESSION,'return_url'))
-               goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
->>>>>>> HEAD~33
 
        killme();
 }