From c7e228807b40fdc82c880b42296212cad4a816b9 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Thu, 10 Mar 2022 23:11:09 -0600 Subject: [PATCH] Resolve conflict --- src/ScriptEditor/ui/themes.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ScriptEditor/ui/themes.ts b/src/ScriptEditor/ui/themes.ts index 6736bbf97..adc136e63 100644 --- a/src/ScriptEditor/ui/themes.ts +++ b/src/ScriptEditor/ui/themes.ts @@ -474,6 +474,7 @@ export async function loadThemes(monaco: { editor: any }): Promise { foreground: "FFB86C", fontStyle: "italic", }, + { token: "netscriptfunction", foreground: "FF79C6",