Skip to content

Commit f853a4c

Browse files
remove bad conflicts
1 parent 0f172d8 commit f853a4c

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

doc/source/whatsnew/v0.25.0.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -607,12 +607,9 @@ Strings
607607
^^^^^^^
608608
- Bug in :func:`Series.str.replace` not applying regex in patterns of length 1 (:issue:`24804`)
609609

610-
<<<<<<< HEAD
611-
=======
612610
- Bug in the ``__name__`` attribute of several methods of :class:`Series.str`, which were set incorrectly (:issue:`23551`)
613611
-
614612
-
615-
>>>>>>> github/master
616613

617614

618615
Interval

0 commit comments

Comments
 (0)