From 4a74cd9afeb5c75a1f3ceaadd5cdfdb07d0b8918 Mon Sep 17 00:00:00 2001 From: Vincent Kling Date: Tue, 8 Nov 2022 11:56:08 +0100 Subject: [PATCH] Resolve conflict --- optional/fetchmail/fetchmail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optional/fetchmail/fetchmail.py b/optional/fetchmail/fetchmail.py index 1889d808..2afd103b 100755 --- a/optional/fetchmail/fetchmail.py +++ b/optional/fetchmail/fetchmail.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -import distutils.util + import time import os import tempfile