f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-10 02:42:43 +00:00
Code Wiki Activity

Merge

Browse Source
This commit is contained in:
David Bolack
2024-05-20 17:58:22 -05:00
parent 916bd5f4d6
commit 54d2709d6a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -14,14 +14,10 @@ const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
const Frame = require('react-frame-component').default; const Frame = require('react-frame-component').default;
const dedent = require('dedent-tabs').default; const dedent = require('dedent-tabs').default;
<<<<<<< HEAD
const staticThemes = require('themes/themes.json');
=======
const DOMPurify = require('dompurify'); const DOMPurify = require('dompurify');
const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false }; const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false };
const Themes = require('themes/themes.json'); const staticThemes = require('themes/themes.json');
>>>>>>> master
const PAGE_HEIGHT = 1056; const PAGE_HEIGHT = 1056;