From e03449b75cc59302a97be91749e357b177a4b147 Mon Sep 17 00:00:00 2001
From: bree <me@bree.dev>
Date: Sun, 4 Jul 2021 21:11:23 -0400
Subject: [PATCH] Fix merge conflict missed from before
---
src/context/Theme.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/context/Theme.tsx b/src/context/Theme.tsx
index 02f5ca6..a676478 100644
--- a/src/context/Theme.tsx
+++ b/src/context/Theme.tsx
@@ -270,8 +270,8 @@ interface Props {
function Theme({ children, options }: Props) {
const theme: Theme = {
...PRESETS["dark"],
- ...PRESETS[props.options?.preset ?? ''],
- ...props.options?.custom
+ ...PRESETS[options?.preset ?? ''],
+ ...options?.custom
};
const root = document.documentElement.style;
--
GitLab