Skip to content

Commit

Permalink
fix merge-collission
Browse files Browse the repository at this point in the history
  • Loading branch information
kmuehlbauer committed Nov 21, 2024
1 parent be0d3e0 commit f95408a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion xarray/coding/cftime_offsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def get_date_type(calendar, use_cftime=True):
cftime = attempt_import("cftime")

if _is_standard_calendar(calendar) and not use_cftime:
return _nanosecond_precision_timestamp
return default_precision_timestamp

calendars = {
"noleap": cftime.DatetimeNoLeap,
Expand Down

0 comments on commit f95408a

Please sign in to comment.