mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-15 10:35:20 +01:00
fixed merge conflict
This commit is contained in:
parent
f397c09096
commit
abe16005f6
@ -396,7 +396,7 @@ export default class MainBackground {
|
||||
// AuthService should send the messages to the background not popup.
|
||||
send = (subscriber: string, arg: any = {}) => {
|
||||
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(
|
||||
|
Loading…
Reference in New Issue
Block a user