Skip to content

Commit 98b61e8

Browse files
Ajay SaxenaAjay Saxena
Ajay Saxena
authored and
Ajay Saxena
committed
merge conflict
1 parent cedb690 commit 98b61e8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

doc/source/whatsnew/v0.19.2.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ Performance Improvements
2222

2323
Bug Fixes
2424
~~~~~~~~~
25-
- compat with ``dateutil==2.6.0`` for testing (:issue:`14621`)
26-
- allow ``nanoseconds`` in ``Timestamp.replace`` kwargs (:issue:`14621`)
27-
- BUG in clipboard (linux, python2) with unicode and separator (:issue:`13747`)
28-
=======
25+
2926
- Compat with ``dateutil==2.6.0``; segfault reported in the testing suite (:issue:`14621`)
3027
- Allow ``nanoseconds`` in ``Timestamp.replace`` as a kwarg (:issue:`14621`)
3128

@@ -46,3 +43,4 @@ Bug Fixes
4643

4744

4845
- Explicit check in ``to_stata`` and ``StataWriter`` for out-of-range values when writing doubles (:issue:`14618`)
46+
- BUG in clipboard (linux, python2) with unicode and separator (:issue:`13747`)

0 commit comments

Comments
 (0)