search

blitz-js / zh-hans.blitzjs.com

(Work in progress) Blitzjs.com website in Simplified Chinese!
MIT License
4 stars 3 forks source link

Sync with main repo @ c1b92d08 #65

Closed blitzjs-bot closed 3 years ago

blitzjs-bot commented 3 years ago

This PR was automatically generated.

Merge changes from blitzjs.com at c1b92d08

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

DO NOT SQUASH MERGE THIS PULL REQUEST!

Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.

hylerrix commented 3 years ago

Unexpected merged, use local git push origin main --force to undo this merge.

The correct PR is #66 not this #65