Skip to content
Snippets Groups Projects
Commit 4ea9c8e6 authored by Michael Lumish's avatar Michael Lumish
Browse files

Merge pull request #2188 from ctiller/so-freaking-sick-of-irrelevant-merge-conflicts 

Make it less likely a build.json change triggers a merge conflict
parents d9145d91 9f903dad
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment