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