I think there is no more whitespaces in elementary. So from now on please check if your code is whitespace-free when you commit it. If so, no one will suffer from removing whitespaces and merge conflict. SVN revision: 60223
like big brother e. SVN revision: 45280