Skip to content

Commit a5f4482

Browse files
committed
Fix conflict
2 parents 572b3a0 + 52cef36 commit a5f4482

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Doc/library/dis.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ iterations of the loop.
11841184

11851185
.. opcode:: BUILD_TEMPLATE
11861186

1187-
It consumes ``STACK[-1]`` (interpolations) and ``STACK[-2]`` (strings) and
1187+
Consumes ``STACK[-1]`` (interpolations) and ``STACK[-2]`` (strings) and
11881188
outputs the template object to ``STACK[-1]``.
11891189

11901190
.. versionadded:: 3.14

0 commit comments

Comments
 (0)