mergefix(): fixed issue with master merge

fce2e341 · Torkel Ödegaard · 8a95c563 · fce2e341
Commit fce2e341 authored Jan 31, 2017 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

pkg/models/streams.go
+3 -1

No files found.
--- a/pkg/models/streams.go
+++ b/pkg/models/streams.go
 package models

-import "gopkg.in/guregu/null.v3"
+import (
+	"github.com/grafana/grafana/pkg/components/null"
+)

 type TimePoint [2]null.Float
 type TimeSeriesPoints []TimePoint