Code review comment for lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader

Revision history for this message
Tim Peeters (tpeeters) wrote :

I don't know why the diff lists
237 === removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
238 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-20 15:30:06 +0000
239 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000

and

168 === added file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
169 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000
170 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-26 17:43:24 +0000

The supposedly removed and added files are identical. There was a conflict with that file when merging trunk but it seemed resolved.

« Back to merge proposal