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.

Sign up for GitHub

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

Jump to bottom

git merge smart_holder (Fix git merge accident (pybind11/detail/descr.h)). #30116

Merged
merged 2 commits into from
Apr 2, 2024
Merged

git merge smart_holder (Fix git merge accident (pybind11/detail/descr.h)). #30116

merged 2 commits into from
Apr 2, 2024

Commits on Apr 2, 2024

  1. Fix merge accident in pybind11/detail/descr.h 

    This was noticed only when manually reviewing the diffs with the Google review tools.
    Ralf W. Grosse-Kunstleve committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    704a1da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sh_fix_merge_accident' into sh_fix_merge_accident_pybin… 

    …d11k
    Ralf W. Grosse-Kunstleve committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    7c60e86 View commit details
    Browse the repository at this point in the history