mirror of
https://github.com/pybind/pybind11.git
synced 2025-03-01 22:32:42 +00:00
Fix merge conflict error
This commit is contained in:
parent
6523bc2127
commit
6c6971fc30
@ -510,7 +510,6 @@ error_string(PyObject *exc_type, PyObject *exc_value, PyObject *exc_trace) {
|
||||
result += "): ";
|
||||
result += handle(f_code->co_name).cast<std::string>();
|
||||
result += '\n';
|
||||
frame = frame->f_back;
|
||||
Py_DECREF(f_code);
|
||||
# if PY_VERSION_HEX >= 0x030900B1
|
||||
auto *b_frame = PyFrame_GetBack(frame);
|
||||
|
Loading…
Reference in New Issue
Block a user