From 28aedc2b1412b34f76bc271cc4d3a262fdac2498 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 5 Aug 2026 16:08:06 -0500 Subject: [PATCH] [core] Drop the duplicated FileLock import from a merge collision (#18103) --- esphome/git.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/esphome/git.py b/esphome/git.py index ef3b41d8b93..d1dca3b3ae7 100644 --- a/esphome/git.py +++ b/esphome/git.py @@ -23,9 +23,6 @@ from esphome.helpers import ( write_file, ) -if TYPE_CHECKING: - from filelock import FileLock - if TYPE_CHECKING: from filelock import FileLock