fix merge conflicts on management

This commit is contained in:
Pascal Fischer
2025-02-25 11:57:25 +01:00
parent 81ee172db8
commit fbdfe45c25
8 changed files with 63 additions and 70 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ require (
github.com/miekg/dns v1.1.59
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/nadoo/ipset v0.5.0
github.com/netbirdio/management-integrations/integrations v0.0.0-20250131123435-e2ad9f2cb38b
github.com/netbirdio/management-integrations/integrations v0.0.0-20250225104154-5648068fab25
github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20241010133937-e0df50df217d
github.com/okta/okta-sdk-golang/v2 v2.18.0
github.com/oschwald/maxminddb-golang v1.12.0