-
Maurice van der Pot authored
Use the --whitespace=fix option when rebasing to master for the first time after this commit to prevent conflicts with your own commits.
f143a2f5
Use the --whitespace=fix option when rebasing to master for the first time after this commit to prevent conflicts with your own commits.