Closed lindsayplatt closed 6 years ago
I also dealt with a merge conflict in VIM and ended up with some weird spacing and stuff as "changes".
I also dealt with a merge conflict in VIM and ended up with some weird spacing and stuff as "changes".