From 54d2709d6a14be69c42a12e43d7d00fd5245bf86 Mon Sep 17 00:00:00 2001 From: David Bolack Date: Mon, 20 May 2024 17:58:22 -0500 Subject: [PATCH] Merge --- client/homebrew/brewRenderer/brewRenderer.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 97542a58c..7d50e0e3f 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -14,14 +14,10 @@ const NotificationPopup = require('./notificationPopup/notificationPopup.jsx'); const Frame = require('react-frame-component').default; const dedent = require('dedent-tabs').default; -<<<<<<< HEAD -const staticThemes = require('themes/themes.json'); -======= const DOMPurify = require('dompurify'); const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false }; -const Themes = require('themes/themes.json'); ->>>>>>> master +const staticThemes = require('themes/themes.json'); const PAGE_HEIGHT = 1056;