[SVN Commit] branches/plasma5/PORTS/www/qt5-webkit2

[Tobias Berner]

SVN commit 13559 by tcberner:

Fix conflicts declaration

 M  +1 -1      Makefile