Skip to content

Commit

Permalink
Trying to fix merge conflicts 2
Browse files Browse the repository at this point in the history
  • Loading branch information
unalmis committed Jul 11, 2024
1 parent c3a1401 commit 99029a9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions desc/compute/_basis_vectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -3556,7 +3556,7 @@ def _e_zeta_z_ra(params, transforms, profiles, data, **kwargs):
units="m",
units_long="meters",
description="Differential length along field line",
dim=3,
dim=1,
params=[],
transforms={},
profiles=[],
Expand All @@ -3575,7 +3575,7 @@ def _d_ell_d_zeta(params, transforms, profiles, data, **kwargs):
units="m",
units_long="meters",
description="Differential length along field line, derivative along field line",
dim=3,
dim=1,
params=[],
transforms={},
profiles=[],
Expand Down
Binary file modified tests/inputs/master_compute_data_xyz.pkl
Binary file not shown.

0 comments on commit 99029a9

Please sign in to comment.