Resolve conflicts
This commit is contained in:
parent
281b388e39
commit
bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue