Conflicts: .gitignore src/app/partials/influxdb/editor.html src/app/services/influxdb/influxdbDatasource.js
