Code review comment for lp:~michihenning/unity/phablet-unity-api-whitespace-test

Revision history for this message
MichaƂ Sawicz (saviq) wrote :

Please merge trunk, there's a conflict.

Please use '[[:space:]]$' for the regex, then, and there's three more files with whitespace issues when you merge trunk:

./Components/UbuntuShapeForItem.qml: trailing whitespace
./runtests.sh: trailing whitespace
./plugins/Unity/categories.cpp: trailing whitespace

Components/UbuntuShapeForItem.qml actually has \r\n - should be converted to unix newlines.

review: Needs Fixing

« Back to merge proposal