Fixed some merge errors
authorBernhard Fröhlich <ted@test.cacert.org>
Mon, 19 Nov 2018 22:28:05 +0000 (22:28 +0000)
committerBernhard Fröhlich <ted@test.cacert.org>
Mon, 19 Nov 2018 22:28:05 +0000 (22:28 +0000)
commit35199b7bb05951ec51c45ea650aaff632eab1147
tree9df420439f4005b01158fd82c620f2d67d7d7a14
parent96ad69b12a9a49b00f969ad4f9990f0ac4739dbe
Fixed some merge errors
includes/account.php
includes/notary.inc.php