From 40680d55e09980af4b783780bba153ab8ecdfd20 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 17:55:48 +0100
Subject: [PATCH] Fix merge fail

---
 src/DateUtils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index bc8594c671..8b7a2f3f20 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -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);
         }