IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Common:Utils: fix merge

Browse Source
This commit is contained in:
Timofey Boyko 2023-10-27 11:36:59 +03:00
parent 51cc80ecfa
commit a4f555b853
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/common/utils/index.ts
View File

@ -630,8 +630,6 @@ export const getSystemTheme = () => {
window.matchMedia("(prefers-color-scheme: dark)").matches
? ThemeKeys.DarkStr
: ThemeKeys.BaseStr;
<<<<<<< HEAD
=======
};
export const getEditorTheme = (theme) => {
@ -647,5 +645,4 @@ export const getEditorTheme = (theme) => {
default:
return "default-dark";
}
>>>>>>> develop
};