1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 07:13:32 +00:00

fixed merge conflict

This commit is contained in:
gbubemismith
2023-08-15 15:35:18 -04:00
parent f397c09096
commit abe16005f6

View File

@@ -396,7 +396,7 @@ export default class MainBackground {
// AuthService should send the messages to the background not popup. // AuthService should send the messages to the background not popup.
send = (subscriber: string, arg: any = {}) => { send = (subscriber: string, arg: any = {}) => {
const message = Object.assign({}, { command: subscriber }, arg); const message = Object.assign({}, { command: subscriber }, arg);
that.runtimeBackground.processMessage(message, that as any, null); that.runtimeBackground.processMessage(message, that as any);
}; };
})(); })();
this.authService = new AuthService( this.authService = new AuthService(