mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-02 12:33:56 +01:00
Resolve conflict
This commit is contained in:
parent
67382f0ac9
commit
c7e228807b
@ -474,6 +474,7 @@ export async function loadThemes(monaco: { editor: any }): Promise<void> {
|
|||||||
foreground: "FFB86C",
|
foreground: "FFB86C",
|
||||||
fontStyle: "italic",
|
fontStyle: "italic",
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
token: "netscriptfunction",
|
token: "netscriptfunction",
|
||||||
foreground: "FF79C6",
|
foreground: "FF79C6",
|
||||||
|
Loading…
Reference in New Issue
Block a user