-
Kai Koehne authored
Remove conflict markers. Change-Id: Ie54881eff9df4966d093782841db4db5b4c4268f Reviewed-on: http://codereview.qt.nokia.com/110 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
c3a9436c