Mercurial > trustbridge
comparison ui/certs.qrc @ 657:37ffc8ddb698
Fix merge errors
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | 09bb19e5e369 |
children | eaea1504f282 |
comparison
equal
deleted
inserted
replaced
656:0ca15d937490 | 657:37ffc8ddb698 |
---|