resolve conflicts

arrow-py · Nov 16, 2024 · 272eb8e · 272eb8e
1 parent 9d674ca
commit 272eb8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/test_formatter.py b/tests/test_formatter.py
@@ -3,7 +3,7 @@
 except ImportError:
     from backports import zoneinfo
 
-from datetime import datetime
+from datetime import datetime, timezone
 
 import pytest
 from dateutil import tz as dateutil_tz