crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up some merge mistakes

Browse Source
This commit is contained in:
Bryan Ashby
2022-06-12 14:11:36 -06:00
parent e0fca9f8f7
commit c93b8cda81
3 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/theme.js
View File

@@ -364,7 +364,6 @@ exports.ThemeManager = class ThemeManager {
const format = Config().theme.timeFormat[style] || 'h:mm a';
return _.get(theme, `customization.defaults.timeFormat.${style}`, format);
},
<<<<<<< HEAD
getDateTimeFormat : function(style = 'short') {
const format = Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
return _.get(theme, `customization.defaults.dateTimeFormat.${style}`, format);
@@ -376,16 +375,6 @@ exports.ThemeManager = class ThemeManager {
getStatusVisibleIndicators : function() {
const format = Config().theme.statusVisibleIndicators || [ 'Y', 'N' ];
return _.get(theme, 'customization.defaults.statusVisibleIndicators', format);
=======
getDateTimeFormat: function (style = 'short') {
const format =
Config().theme.dateTimeFormat[style] || 'MM/DD/YYYY h:mm a';
return _.get(
theme,
`customization.defaults.dateTimeFormat.${style}`,
format
);
>>>>>>> 7c01946d6e8ac0023e9692744803466aa96cbadf
},
};
}