2026-11-15 07:38:37 +01:00
1 changed files with 0 additions and 5 deletions
@@ -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