From ee4d59b5474e629e81f6039ee735ba068c012d16 Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Wed, 23 Apr 2025 00:00:32 -0600 Subject: [PATCH] Linter: fix conflict (#104370) Linter: fix enterprise conflict --- pkg/tests/apis/dashboard/integration/api_validation_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tests/apis/dashboard/integration/api_validation_test.go b/pkg/tests/apis/dashboard/integration/api_validation_test.go index 6b28d6b2a39..37db48714a1 100644 --- a/pkg/tests/apis/dashboard/integration/api_validation_test.go +++ b/pkg/tests/apis/dashboard/integration/api_validation_test.go @@ -21,7 +21,6 @@ import ( "github.com/grafana/grafana/pkg/tests/apis" "github.com/grafana/grafana/pkg/tests/testinfra" "github.com/grafana/grafana/pkg/tests/testsuite" - "github.com/grafana/grafana/pkg/util" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -31,6 +30,7 @@ import ( "github.com/grafana/grafana/pkg/apimachinery/utils" "github.com/grafana/grafana/pkg/services/dashboards" // TODO: Check if we can remove this import "github.com/grafana/grafana/pkg/services/quota" + "github.com/grafana/grafana/pkg/util" ) func TestMain(m *testing.M) {