Resolved conflict

This commit is contained in:
Henry 2016-01-06 14:06:28 -08:00
parent b20488e77d
commit a6ecda9cab

View File

@ -51,7 +51,7 @@ define(
};
ClockIndicator.prototype.getGlyphClass = function () {
return "";
return "no-icon no-collapse float-right subtle";
};
ClockIndicator.prototype.getText = function () {