From 6c6971fc300b31960644bc4d83d549bd69f4d1b8 Mon Sep 17 00:00:00 2001
From: Aaron Gokaslan <skylion.aaron@gmail.com>
Date: Wed, 2 Mar 2022 13:22:44 -0500
Subject: [PATCH] Fix merge conflict error

---
 include/pybind11/detail/type_caster_base.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/pybind11/detail/type_caster_base.h b/include/pybind11/detail/type_caster_base.h
index a7d1751ba..bfdcf49e1 100644
--- a/include/pybind11/detail/type_caster_base.h
+++ b/include/pybind11/detail/type_caster_base.h
@@ -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);