From c8763063c0fcd1bf9973d191f7988729f45fdd8b Mon Sep 17 00:00:00 2001
From: voidSatisfaction <lourie@naver.com>
Date: Tue, 7 Nov 2017 22:47:08 +0900
Subject: [PATCH] resolve conflict with master

---
 browser/main/NoteList/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index afb99c23..f394629b 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -643,7 +643,7 @@ class NoteList extends React.Component {
         const dateDisplay = moment(
           config.sortBy === 'CREATED_AT'
             ? note.createdAt : note.updatedAt
-        ).fromNow()
+        ).fromNow('D')
 
         if (isDefault) {
           return (