Merge branch 'dataframe-series-broadcasting-bug-16378' of github.com:AndrewArcher/pandas into dataframe-series-broadcasting-bug-16378

Andrew Archer · Andrew Archer · commit 3d413933b52d · 2017-05-23T12:38:36.000-07:00
diff --git a/pandas/tests/frame/test_convert_to.py b/pandas/tests/frame/test_convert_to.py
@@ -229,4 +229,3 @@ def test_to_records_datetimeindex_with_tz(self, tz):
 
         # both converted to UTC, so they are equal
         tm.assert_numpy_array_equal(result, expected)
-

Original file line number	Diff line number	Diff line change
`@@ -229,4 +229,3 @@ def test_to_records_datetimeindex_with_tz(self, tz):`
`229`	`229`
`230`	`230`	`# both converted to UTC, so they are equal`
`231`	`231`	`tm.assert_numpy_array_equal(result, expected)`
`232`		`-`