7e78003fc7
Four of the last five branches conflicted only on the changelog, each time because two branches appended a bullet under the same heading. Git's union driver combines them; it concatenates blindly, so the existing de-duplication pass after a merge is what keeps the section honest.
5 lines
226 B
Plaintext
5 lines
226 B
Plaintext
tests/fixtures/*.fig filter=lfs diff=lfs merge=lfs -text
|
|
tests/fixtures/fonts/*.ttf filter=lfs diff=lfs merge=lfs -text
|
|
packages/core/vendor/canvaskit-webgpu/*.wasm filter=lfs diff=lfs merge=lfs -text
|
|
CHANGELOG.md merge=union
|