I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
* DropzoneModule hello world
* Buttoning things up
* Exclude by default
* Upstream refs
* Cleanup
* Add modules folder to path
* Case and path matters
* Exclude from header
* Guard