Commit db43824

committed

TST: split up test_merge

very small bug fix w.r.t. tz concatting Author: Jeff Reback <[email protected]> Closes #13300 from jreback/merges and squashes the following commits: 727dfe9 [Jeff Reback] BUG: concat of same-tz needs string comparison for uniqueness 1560136 [Jeff Reback] TST: split up test_merge

1 parent 456dcae commit db43824Copy full SHA for db43824

5 files changed

+1138

-1107

lines changed

ci
- requirements-3.4.run
pandas
- tools/tests
- types
  - concat.py

5 files changed

+1138

-1107

lines changed

`‎ci/requirements-3.4.run`

+1-1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pytz`
	`1`	`+pytz=2015.7`
`2`	`2`	`numpy=1.8.1`
`3`	`3`	`openpyxl`
`4`	`4`	`xlsxwriter`

Comments

(0)