Skip to content
Unverified Commit bc7df173 authored by Matthew Justin Bauer's avatar Matthew Justin Bauer Committed by GitHub
Browse files

gitattributes: disable merge=union in all-packages 

This would lead to some merge issues occasionally.
parent cd7047c4
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