From 967efea520d61bc6a9cf2d0cfa29c90ce018a658 Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Fri, 22 Sep 2017 13:28:53 +0200
Subject: [PATCH] fix merge issue

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

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 9e568866579..bab2d597a67 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -211,7 +211,7 @@ export default class InfluxDatasource {
 
     if (this.username) {
       params.u =  this.username;
-      params.u =  this.password;
+      params.p =  this.password;
     }
 
     if (options && options.database) {