diff --git a/.gitattributes b/.gitattributes index 09976d6..d43880c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,2 @@ -# Every PR adds an entry at the top of TODO.md's Completed Steps; union keeps -# both sides instead of conflicting. Git never reports a conflict here: read -# the merged entries after every merge or rebase. -TODO.md merge=union - # yarn's release file is one opaque file in diffs and merges. .yarn/releases/** binary