Merge pull request #425 from rashidkpc/master

Fixing silly conflict
This commit is contained in:
Rashid Khan 2013-08-27 10:47:18 -07:00
commit ae5ddf8736

View File

@ -618,4 +618,4 @@ angular.module('kibana.histogram', [])
return result;
};
});
});