Resolve conflict

This commit is contained in:
nickofolas 2022-03-10 23:11:09 -06:00 committed by nickofolas
parent 137539c1db
commit 1f9414fd0e

@ -474,6 +474,7 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
foreground: "FFB86C",
fontStyle: "italic",
},
{
token: "netscriptfunction",
foreground: "FF79C6",