Skip to content
Snippets Groups Projects
Verified Commit e03449b7 authored by bree's avatar bree
Browse files

Fix merge conflict missed from before

parent e070f26b
No related merge requests found
...@@ -270,8 +270,8 @@ interface Props { ...@@ -270,8 +270,8 @@ interface Props {
function Theme({ children, options }: Props) { function Theme({ children, options }: Props) {
const theme: Theme = { const theme: Theme = {
...PRESETS["dark"], ...PRESETS["dark"],
...PRESETS[props.options?.preset ?? ''], ...PRESETS[options?.preset ?? ''],
...props.options?.custom ...options?.custom
}; };
const root = document.documentElement.style; const root = document.documentElement.style;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment