summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-09-08 21:22:35 +0200
committerMichael Tänzer <neo@nhng.de>2013-09-08 21:22:35 +0200
commite3ac4c85d6c95f55835acb681dc2c4103730933f (patch)
treea729a7db62de574e24b927dca1bd35dc815161cf /www
parent18a9f2205edaaf42ab15f48c2165c31883bba8e5 (diff)
downloadcacert-devel-e3ac4c85d6c95f55835acb681dc2c4103730933f.tar.gz
cacert-devel-e3ac4c85d6c95f55835acb681dc2c4103730933f.tar.xz
cacert-devel-e3ac4c85d6c95f55835acb681dc2c4103730933f.zip
Release: Remove left-over merge markers
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www')
-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;