> That caused a merge conflict.
From what I can see, this is a whitespace only change.
This is an excellent example of why such style changes should never be in a functional patch, but separate commits.
Bug 1590473 Comment 92 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
> That caused a merge conflict.
From what I can see, this is a whitespace only change. So, unless I'm mistaken, you can simply ignore that hunk.
This is an excellent example of why such style changes should never be in a functional patch, but separate commits.