Resolved conflict
This commit is contained in:
@@ -51,7 +51,7 @@ define(
|
|||||||
};
|
};
|
||||||
|
|
||||||
ClockIndicator.prototype.getGlyphClass = function () {
|
ClockIndicator.prototype.getGlyphClass = function () {
|
||||||
return "";
|
return "no-icon no-collapse float-right subtle";
|
||||||
};
|
};
|
||||||
|
|
||||||
ClockIndicator.prototype.getText = function () {
|
ClockIndicator.prototype.getText = function () {
|
||||||
|
|||||||
Reference in New Issue
Block a user