1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-01 23:15:47 +02:00

Resolve conflicts

This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View File

@@ -53,7 +53,6 @@ module.exports = (params) => new Promise(async (res, rej) => {
model: os.cpus()[0].model,
cores: os.cpus().length
},
top_image: meta.top_image,
broadcasts: meta.broadcasts
});
});