From a90bba859a0993735a9e309f70ea09eb8cbb5abe Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 7 Dec 2018 14:17:09 +0100
Subject: [PATCH] fixes merge error

---
 pkg/services/alerting/notifiers/googlechat.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/services/alerting/notifiers/googlechat.go b/pkg/services/alerting/notifiers/googlechat.go
index 5d8fba1f8c6..5195a7d21bf 100644
--- a/pkg/services/alerting/notifiers/googlechat.go
+++ b/pkg/services/alerting/notifiers/googlechat.go
@@ -3,12 +3,13 @@ package notifiers
 import (
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
-	"time"
 )
 
 func init() {
@@ -35,7 +36,7 @@ func NewGoogleChatNotifier(model *m.AlertNotification) (alerting.Notifier, error
 	}
 
 	return &GoogleChatNotifier{
-		NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings),
+		NotifierBase: NewNotifierBase(model),
 		Url:          url,
 		log:          log.New("alerting.notifier.googlechat"),
 	}, nil