Resolve conflicts

2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
--- a/src/index.ts
+++ b/src/index.ts
@@ -109,7 +109,6 @@ async function workerMain(opt) {
 */
 async function init(): Promise<Config> {
 	Logger.info('Welcome to Misskey!');
-	Logger.info(chalk.bold('Misskey <aoi>'));
 	Logger.info('Initializing...');

 	EnvironmentInfo.show();