summaryrefslogtreecommitdiffstats
path: root/optional-requirements.txt
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2023-04-30 16:18:40 +0200
committernicolargo <nicolas@nicolargo.com>2023-04-30 16:18:40 +0200
commitcd6a9d0ef318aee5461667419dd1ff76067dcc58 (patch)
tree08050ee65e4670ba0e1f2214b88662a9ebffef28 /optional-requirements.txt
parent806f2a4b7f6baf7d42682eb858edd77025492d6c (diff)
parent4caa267eec42713a5da0830ca27f14e9f9467300 (diff)
Resolve conflict
Diffstat (limited to 'optional-requirements.txt')
-rw-r--r--optional-requirements.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 45152524..4fdfff87 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -34,5 +34,5 @@ six
sparklines
statsd
wifi
-zeroconf==0.47.3; python_version < "3.7"
-zeroconf>=0.19.1; python_version >= "3.7"
+zeroconf==0.58.2; python_version < "3.7"
+zeroconf; python_version >= "3.7"