Mercurial > trustbridge
diff ui/certificate.cpp @ 657:37ffc8ddb698
Fix merge errors
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | bf445b0e1126 |
children | 320a64d58e62 |
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | bf445b0e1126 |
children | 320a64d58e62 |