From a6ecda9cab704ec9203ba59cad0ce020d92d488b Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Wed, 6 Jan 2016 14:06:28 -0800
Subject: [PATCH] Resolved conflict

---
 platform/features/clock/src/indicators/ClockIndicator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/features/clock/src/indicators/ClockIndicator.js b/platform/features/clock/src/indicators/ClockIndicator.js
index 11e5c0fca5..a564ddf8d1 100644
--- a/platform/features/clock/src/indicators/ClockIndicator.js
+++ b/platform/features/clock/src/indicators/ClockIndicator.js
@@ -51,7 +51,7 @@ define(
         };
 
         ClockIndicator.prototype.getGlyphClass = function () {
-            return "";
+            return "no-icon no-collapse float-right subtle";
         };
 
         ClockIndicator.prototype.getText = function () {