Commit ae5ddf87 by Rashid Khan

Merge pull request #425 from rashidkpc/master

Fixing silly conflict
parents a6c425ef 3330a6b9
...@@ -618,4 +618,4 @@ angular.module('kibana.histogram', []) ...@@ -618,4 +618,4 @@ angular.module('kibana.histogram', [])
return result; return result;
}; };
}); });
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment