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