|
|
@@ -2,10 +2,5 @@
|
|
|
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
|
|
# after editing either side, bring the other along and re-record with:
|
|
|
# pnpm run verify-translation-pairing --write
|
|
|
-<<<<<<< HEAD
|
|
|
README.md: d80c4a13e3d1b0f1713a6788446ae24fe3550381
|
|
|
README.zh.md: 727721824790f33b99fc7c79d96420434cc3a1d0
|
|
|
-=======
|
|
|
-README.md: 4724ebc75d441252245a0e811a4ae34f8b529a98
|
|
|
-README.zh.md: 6a0076742efccaf946910c77c77a9b74194b9dc5
|
|
|
->>>>>>> origin/master
|