Skip to content

Commit bc5f1fb

Browse files
author
Ben Kandel
committed
cleanup
1 parent ef6db68 commit bc5f1fb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pandas/tools/merge.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1457,8 +1457,8 @@ def __init__(self, objs, axis=0, join='outer', join_axes=None,
14571457
self.axis = axis
14581458
self.join_axes = join_axes
14591459
self.keys = keys
1460-
if hasattr(keys, 'names'):
1461-
self.names = names or keys.names
1460+
if names is None and hasattr(keys, 'names'):
1461+
self.names = keys.names
14621462
else:
14631463
self.names = names
14641464
self.levels = levels

0 commit comments

Comments
 (0)