Lines Matching full:conflicts
540 // avoid gratuitous conflicts when merging into the master branch.
