Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge main and resolve conflicts. #2240

Open
wants to merge 2 commits into
base: wuandy/PplPP
Choose a base branch
from

Commits on Nov 29, 2024

  1. # Conflicts:

    #	dev/conformance/runner.ts
    #	dev/src/reference/query.ts
    #	dev/system-test/firestore.ts
    #	types/firestore.d.ts
    tom-andersen committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    e4de4bf View commit details
    Browse the repository at this point in the history
  2. fix

    tom-andersen committed Nov 29, 2024
    Configuration menu
    Copy the full SHA
    79c8b27 View commit details
    Browse the repository at this point in the history