From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 29 Mar 2018 14:48:47 +0900
Subject: Resolve conflicts

---
 src/server/web/app/desktop/views/components/posts.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/web/app/desktop/views/components/posts.vue')

diff --git a/src/server/web/app/desktop/views/components/posts.vue b/src/server/web/app/desktop/views/components/posts.vue
index ffceff8762..5031667c7c 100644
--- a/src/server/web/app/desktop/views/components/posts.vue
+++ b/src/server/web/app/desktop/views/components/posts.vue
@@ -30,8 +30,8 @@ export default Vue.extend({
 	computed: {
 		_posts(): any[] {
 			return (this.posts as any).map(post => {
-				const date = new Date(post.created_at).getDate();
-				const month = new Date(post.created_at).getMonth() + 1;
+				const date = new Date(post.createdAt).getDate();
+				const month = new Date(post.createdAt).getMonth() + 1;
 				post._date = date;
 				post._datetext = `${month}月 ${date}日`;
 				return post;
-- 
cgit v1.2.3-freya

