From 3350a3477de5cef3112306ed2a14b2fae6ce2354 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Mon, 20 Aug 2018 13:31:06 +0200
Subject: [PATCH] fix after merge with master

---
 pkg/services/alerting/notifier.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index b458656404a..39f91c1caea 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/imguploader"