From 3aed867b4ba094d7315db3333096b16b85fb9b51 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Thu, 15 Mar 2018 10:35:50 +0100
Subject: [PATCH] fix merge error

---
 public/app/plugins/datasource/influxdb/datasource.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 19df26b9e63..90337fdc3f2 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -228,10 +228,10 @@ export default class InfluxDatasource {
   }
 
   _influxRequest(method: string, url: string, data: any, options?: any) {
-    var currentUrl = this.urls.shift();
+    const currentUrl = this.urls.shift();
     this.urls.push(currentUrl);
 
-    var params: any = {};
+    let params: any = {};
 
     if (this.username) {
       params.u = this.username;
@@ -252,7 +252,7 @@ export default class InfluxDatasource {
       data = null;
     }
 
-    var req: any = {
+    let req: any = {
       method: method,
       url: currentUrl + url,
       params: params,
@@ -270,7 +270,7 @@ export default class InfluxDatasource {
       req.headers.Authorization = this.basicAuth;
     }
 
-    return this.backendSrv.datasourceRequest(options).then(
+    return this.backendSrv.datasourceRequest(req).then(
       result => {
         return result.data;
       },