conflict

pola-rs · Oct 28, 2023 · ef91ad4 · ef91ad4
1 parent ec2876a
commit ef91ad4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/py-polars/polars/utils/convert.py b/py-polars/polars/utils/convert.py
@@ -97,7 +97,7 @@ def _negate_duration(duration: str) -> str:
     return f"-{duration}"
 
 
-def _datetime_to_pl_timestamp(dt: datetime, time_unit: TimeUnit) -> int:
+def _datetime_to_pl_timestamp(dt: datetime, time_unit: TimeUnit | None) -> int:
     """Convert a python datetime to a timestamp in given time unit."""
     if dt.tzinfo is None:
         # Make sure to use UTC rather than system time zone.