Fix mis-merge

This resets all the files outside of TrackMate back to their previous
revision...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>