Skip to content

Commit 440fe19

Browse files
hugovkmiss-islington
authored andcommitted
Prevent GitHub's web conflict editor from converting LF to CRLF (GH-148739)
(cherry picked from commit 9e236522302a003ae659a825da74501f3aa1c4c1) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent a37b105 commit 440fe19

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/* noeol
3434
Lib/venv/scripts/common/activate text eol=lf
3535
Lib/venv/scripts/posix/* text eol=lf
3636

37+
# Prevent GitHub's web conflict editor from converting LF to CRLF
38+
*.rst text eol=lf
39+
3740
# CRLF files
3841
[attr]dos text eol=crlf
3942

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
2-
that calls :func:`next` on the same reader from within ``__next__``.
1+
Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
2+
that calls :func:`next` on the same reader from within ``__next__``.

0 commit comments

Comments
 (0)