fixup

picnixz · picnixz · commit 793196d3ece0 · 2025-01-14T11:54:49.000+01:00
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -290,7 +290,6 @@ BaseException_with_traceback_impl(PyBaseExceptionObject *self, PyObject *tb)
 BaseException.add_note
     note: object(subclass_of="&PyUnicode_Type")
     /
->>>>>>> upstream/main
 
 Add a note to the exception
 [clinic start generated code]*/

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ BaseException_with_traceback_impl(PyBaseExceptionObject self, PyObject tb)`
`290`	`290`	`BaseException.add_note`
`291`	`291`	`note: object(subclass_of="&PyUnicode_Type")`
`292`	`292`	`/`
`293`		`->>>>>>> upstream/main`
`294`	`293`
`295`	`294`	`Add a note to the exception`
`296`	`295`	`[clinic start generated code]*/`