fixes

FreifunkBremen · Apr 14, 2022 · 710772c · 710772c
1 parent 60639f2
commit 710772c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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) {