summaryrefslogtreecommitdiff
path: root/pages
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 /pages
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 'pages')
0 files changed, 0 insertions, 0 deletions