chore(build): resolve conflicts

intergral · Sep 24, 2024 · 047a54f · 047a54f
1 parent 3bca5db
commit 047a54f
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/pkg/services/ngalert/notifier/alertmanager_config.go b/pkg/services/ngalert/notifier/alertmanager_config.go
@@ -14,20 +14,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/grafana/grafana/pkg/util/errutil"
-)
-
-var (
-	// ErrAlertmanagerReceiverInUse is primarily meant for when a receiver is used by a rule and is being deleted.
-	ErrAlertmanagerReceiverInUse = errutil.BadRequest("alerting.notifications.alertmanager.receiverInUse").MustTemplate("receiver [Name: {{ .Public.Receiver }}] is used by rule: {{ .Error }}",
-		errutil.WithPublic(
-			"receiver [Name: {{ .Public.Receiver }}] is used by rule",
-		))
-	// ErrAlertmanagerTimeIntervalInUse is primarily meant for when a time interval is used by a rule and is being deleted.
-	ErrAlertmanagerTimeIntervalInUse = errutil.BadRequest("alerting.notifications.alertmanager.intervalInUse").MustTemplate("time interval [Name: {{ .Public.Interval }}] is used by rule: {{ .Error }}",
-		errutil.WithPublic(
-			"time interval [Name: {{ .Public.Interval }}] is used by rule",
-		))
 )
 
 var (