Release: Remove left-over merge markers
authorMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 19:22:35 +0000 (21:22 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 19:22:35 +0000 (21:22 +0200)
Signed-off-by: Michael Tänzer <neo@nhng.de>
www/gpg.php

index 2fdc518..f24d84c 100644 (file)
 */ ?>
 <?
        require_once("../includes/loggedin.php");
-<<<<<<< HEAD
        require_once("../includes/lib/general.php");
-=======
        require_once('../includes/notary.inc.php');
->>>>>>> merge-bug-1177-893-1136-1123-1137
 
         $id = 0; if(array_key_exists('id',$_REQUEST)) $id=intval($_REQUEST['id']);
        $oldid = $_REQUEST['oldid'] = array_key_exists('oldid',$_REQUEST) ? intval($_REQUEST['oldid']) : 0;