Resolve merge conflict in tests
authorJohannes Schanda <schanda@itestra.de>
Fri, 18 Jan 2013 09:55:19 +0000 (10:55 +0100)
committerJohannes Schanda <schanda@itestra.de>
Fri, 18 Jan 2013 09:55:19 +0000 (10:55 +0100)
commite0c1d056c74f0b67f9dfccee9bb5a5e8eeeb129e
tree069091ee694867db56cea0f3ab044103526e4a6c
parentb5d00531c0c316d66e570002e707f6c6cd5a529a
Resolve merge conflict in tests
src/test/DBusInputStreamTest.cpp
src/test/DBusVariantTest.cpp