From 9d7ab78d9f0c38c143f8cdf1fda0644897493e12 Mon Sep 17 00:00:00 2001
From: ilgizar <ilgizar@gmail.com>
Date: Wed, 14 Mar 2018 23:39:05 +0500
Subject: [PATCH] Resolved conflict

---
 public/app/plugins/panel/graph/graph.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index 231b1ecaf42..bbfe63a87b2 100755
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -17,7 +17,7 @@ import { appEvents, coreModule, updateLegendValues } from 'app/core/core';
 import GraphTooltip from './graph_tooltip';
 import { ThresholdManager } from './threshold_manager';
 import { EventManager } from 'app/features/annotations/all';
-import { convertValuesToHistogram, getSeriesValues } from './histogram';
+import { convertToHistogramData } from './histogram';
 import { alignYLevel } from './align_yaxes';
 import config from 'app/core/config';