From fce2e341d232d91137da62a4359fee541732bb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Tue, 31 Jan 2017 09:00:36 +0100
Subject: [PATCH] mergefix(): fixed issue with master merge

---
 pkg/models/streams.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/models/streams.go b/pkg/models/streams.go
index c2c58e83f7b..2fe2a13510f 100644
--- a/pkg/models/streams.go
+++ b/pkg/models/streams.go
@@ -1,6 +1,8 @@
 package models
 
-import "gopkg.in/guregu/null.v3"
+import (
+	"github.com/grafana/grafana/pkg/components/null"
+)
 
 type TimePoint [2]null.Float
 type TimeSeriesPoints []TimePoint