datasource: fix merge conflict - restore dashboards tab

public/app/features/plugins/ds_edit_ctrl.ts

@@ -114,7 +114,7 @@ export class DataSourceEditCtrl {
     this.hasDashboards = false;
     this.hasDashboards = false;
     return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
     return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
       this.datasourceMeta = pluginInfo;
       this.datasourceMeta = pluginInfo;
-      this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'});
+      this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'}) !== undefined;
     });
     });
   }
   }
 
 

public/app/features/plugins/partials/ds_edit.html

@@ -84,5 +84,8 @@
 
 
 			</form>
 			</form>
     </div>
     </div>
+    <div ng-if="ctrl.tabIndex === 1" class="tab-content">
+      <dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
+    </div>
   </div>
   </div>
 </div>
 </div>