Merge branch 'master' of github.com:grafana/grafana

c369350c · Torkel Ödegaard · bc3c3942 · e9df31b6 · c369350c
Commit c369350c authored Sep 22, 2015 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

public/app/plugins/datasource/grafana/datasource.js
+2 -4

No files found.
--- a/public/app/plugins/datasource/grafana/datasource.js
+++ b/public/app/plugins/datasource/grafana/datasource.js
 define([
-  'angular',
+  'angular'
-  'lodash',
-  './directives',
 ],
-function (angular, _) {
+function (angular) {
  'use strict';
  var module = angular.module('grafana.services');