From 710772ca299c18bd1ea90e2b2fc842326b2290d3 Mon Sep 17 00:00:00 2001 From: genofire Date: Thu, 14 Apr 2022 13:28:56 +0200 Subject: [PATCH] fixes --- output/filter/inarea/inarea_test.go | 6 ------ output/prometheus-sd/output.go | 4 ++-- output/prometheus-sd/output_test.go | 6 +++--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/output/filter/inarea/inarea_test.go b/output/filter/inarea/inarea_test.go index 933bd16c..89a3c792 100644 --- a/output/filter/inarea/inarea_test.go +++ b/output/filter/inarea/inarea_test.go @@ -3,15 +3,9 @@ package inarea import ( "testing" -<<<<<<< HEAD "github.com/FreifunkBremen/yanic/data" "github.com/FreifunkBremen/yanic/runtime" "github.com/stretchr/testify/assert" -======= - "github.com/stretchr/testify/assert" - "yanic/data" - "yanic/runtime" ->>>>>>> 64b9cfe (add primary_domain_dode) ) func TestFilterInArea(t *testing.T) { diff --git a/output/prometheus-sd/output.go b/output/prometheus-sd/output.go index 7e595c0b..d5e8b8e2 100644 --- a/output/prometheus-sd/output.go +++ b/output/prometheus-sd/output.go @@ -3,8 +3,8 @@ package prometheus_sd import ( "errors" - "yanic/output" - "yanic/runtime" + "github.com/FreifunkBremen/yanic/output" + "github.com/FreifunkBremen/yanic/runtime" ) type Output struct { diff --git a/output/prometheus-sd/output_test.go b/output/prometheus-sd/output_test.go index b1941d87..3df1c73c 100644 --- a/output/prometheus-sd/output_test.go +++ b/output/prometheus-sd/output_test.go @@ -1,13 +1,13 @@ package prometheus_sd import ( - "os" "net" + "os" "testing" "github.com/stretchr/testify/assert" - "yanic/data" - "yanic/runtime" + "github.com/FreifunkBremen/yanic/data" + "github.com/FreifunkBremen/yanic/runtime" ) func TestOutput(t *testing.T) {