Changes: Fix merge-conflict typo in tests.pro
authorMathias Hasselmann <mathias@openismus.com>
Mon, 13 Dec 2010 22:54:22 +0000 (23:54 +0100)
committerMathias Hasselmann <mathias@openismus.com>
Mon, 13 Dec 2010 22:54:22 +0000 (23:54 +0100)
commit0bd51d5678c8b208a3c6128906741c65c07bffc8
treef456810ba80d5ba61aec573fd9deecf7bf67001b
parent770f9b857680f95260163292293030598aebc6e5
Changes: Fix merge-conflict typo in tests.pro

RevBy: TrustMe
tests/tests.pro