Fix merge fail
parent
c22978d033
commit
40680d55e0
|
@ -62,6 +62,8 @@ function twelveHourTime(date) {
|
|||
module.exports = {
|
||||
formatDate: function(date) {
|
||||
var now = new Date();
|
||||
const days = getDaysArray();
|
||||
const months = getMonthsArray();
|
||||
if (date.toDateString() === now.toDateString()) {
|
||||
return this.formatTime(date);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue