Closed amaiorano closed 8 years ago
Fixes 2 cases where files were not being merged correctly:
Good fix, thanks. Can you rebase this commit on top of master please.
Rebased! Thanks.
Fixes 2 cases where files were not being merged correctly: