summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/gpg.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 2fdc518..f24d84c 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -17,11 +17,8 @@
*/ ?>
<?
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;