Comment # 11 on bug 1125542 from Wolfgang Bauer

python-qt4 built successfully in Factory meanwhile, and the "zdup" test passed
as well again:
https://openqa.opensuse.org/tests/865963

So I'll close this.

The conflict should be gone in the next TW snapshot.