Skip to content

Commit 4ac18c1

Browse files
committed
DOC: Fixes flake8 issues in whatsnew v0.13.* pandas-dev#24256
Another attempt to fix the merge conflict with setup.cfg
1 parent 6775fd9 commit 4ac18c1

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

setup.cfg

+7-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ignore = E402, # module level import not at top of file
4545
E703, # statement ends with a semicolon
4646

4747
exclude =
48-
doc/source/whatsnew/v0.7.0.rst
48+
doc/source/whatsnew/v0.7.0.rst
4949
doc/source/whatsnew/v0.7.3.rst
5050
doc/source/whatsnew/v0.8.0.rst
5151
doc/source/whatsnew/v0.9.0.rst
@@ -54,11 +54,6 @@ exclude =
5454
doc/source/whatsnew/v0.10.1.rst
5555
doc/source/whatsnew/v0.11.0.rst
5656
doc/source/whatsnew/v0.12.0.rst
57-
<<<<<<< HEAD
58-
=======
59-
doc/source/whatsnew/v0.13.0.rst
60-
doc/source/whatsnew/v0.13.1.rst
61-
>>>>>>> parent of bb06bdb63... DOC: Closes #24256 Fix flake8 issues in whatsnew v0.13*
6257
doc/source/whatsnew/v0.14.0.rst
6358
doc/source/whatsnew/v0.14.1.rst
6459
doc/source/whatsnew/v0.15.0.rst
@@ -71,11 +66,16 @@ exclude =
7166
doc/source/whatsnew/v0.17.1.rst
7267
doc/source/whatsnew/v0.18.0.rst
7368
doc/source/whatsnew/v0.18.1.rst
69+
doc/source/whatsnew/v0.19.0.rst
70+
doc/source/whatsnew/v0.20.0.rst
71+
doc/source/whatsnew/v0.21.0.rst
72+
doc/source/whatsnew/v0.23.1.rst
73+
doc/source/whatsnew/v0.23.2.rst
7474
doc/source/basics.rst
7575
doc/source/contributing_docstring.rst
7676
doc/source/enhancingperf.rst
7777
doc/source/groupby.rst
78-
doc/source/indexing.rst
78+
doc/source/indexing.rst
7979
doc/source/missing_data.rst
8080
doc/source/options.rst
8181
doc/source/release.rst

0 commit comments

Comments
 (0)