Skip to content

Commit 95384ac

Browse files
authored
Merge changes from pydata#9476
1 parent e7ab84d commit 95384ac

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

xarray/core/datatree.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -468,14 +468,9 @@ def __init__(
468468
# shallow copy to avoid modifying arguments in-place (see GH issue #9196)
469469
self.children = {name: child.copy() for name, child in children.items()}
470470

471-
<<<<<<< eschalk/make-illegal-path-like-variable-names-when-dt-from-ds
472-
def _set_node_data(self, ds: Dataset):
473-
_check_for_slashes_in_names(ds.variables)
474-
data_vars, coord_vars = _collect_data_and_coord_variables(ds)
475-
=======
476471
def _set_node_data(self, dataset: Dataset):
472+
_check_for_slashes_in_names(ds.variables)
477473
data_vars, coord_vars = _collect_data_and_coord_variables(dataset)
478-
>>>>>>> main
479474
self._data_variables = data_vars
480475
self._node_coord_variables = coord_vars
481476
self._node_dims = dataset._dims

0 commit comments

Comments
 (0)