Merge pull request #425 from rashidkpc/master

Fixing silly conflict
2013-08-27 10:47:18 -07:00
parent a6c425ef97 3330a6b9f7
commit ae5ddf8736
1 changed files with 1 additions and 1 deletions
@@ -618,4 +618,4 @@ angular.module('kibana.histogram', [])
    return result;
  };

-});
+});