fix conflicts

This commit is contained in:
Olivier Gagnon 2022-05-19 01:43:54 -04:00
parent 2cb02bf445
commit ca1a2aad33

@ -98,9 +98,8 @@ export function NetscriptUserInterface(): InternalAPI<IUserInterface> {
return gameInfo;
},
clearTerminal: function (): void {
updateRam("clearTerminal");
workerScript.log("ui.clearTerminal", () => `Clearing terminal`);
clearTerminal: (ctx: NetscriptContext) => (): void => {
ctx.log(() => `Clearing terminal`);
Terminal.clear();
},
};