conflict resolution

Ajay Saxena · Ajay Saxena · commit 1dca292e95fd · 2016-11-17T15:53:17.000-05:00
diff --git a/doc/source/whatsnew/v0.19.2.txt b/doc/source/whatsnew/v0.19.2.txt
@@ -43,4 +43,3 @@ Bug Fixes
 
 
 - Explicit check in ``to_stata`` and ``StataWriter`` for out-of-range values when writing doubles (:issue:`14618`)
-- BUG in clipboard (linux, python2) with unicode and separator (:issue:`13747`)

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,3 @@ Bug Fixes`
`43`	`43`
`44`	`44`
`45`	`45`	- 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`)