mirror of
https://github.com/python/cpython.git
synced 2026-05-06 04:37:33 -04:00
Prevent GitHub's web conflict editor from converting LF to CRLF (#148739)
This commit is contained in:
committed by
GitHub
parent
4b33308137
commit
9e23652230
@@ -34,6 +34,9 @@ Lib/test/xmltestdata/* noeol
|
||||
Lib/venv/scripts/common/activate text eol=lf
|
||||
Lib/venv/scripts/posix/* text eol=lf
|
||||
|
||||
# Prevent GitHub's web conflict editor from converting LF to CRLF
|
||||
*.rst text eol=lf
|
||||
|
||||
# CRLF files
|
||||
[attr]dos text eol=crlf
|
||||
|
||||
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
|
||||
that calls :func:`next` on the same reader from within ``__next__``.
|
||||
Fix crash in :mod:`csv` reader when iterating with a re-entrant iterator
|
||||
that calls :func:`next` on the same reader from within ``__next__``.
|
||||
|
||||
Reference in New Issue
Block a user