Fix horizontal time display when conflict
Fix horizontal time display when conflict

If military time is not set, hour display from 12 to 23
would still be displayed in military time if it
conflicted with the minute display.

groyoh/minimalin,groyoh/minimalin,groyoh/minimalin,groyoh/minimalin,groyoh/minimalin