From a0bc613a2b7289e3aa4b8b81e94a01c6e9876a2f Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Wed, 9 Aug 2017 09:43:25 -0300 Subject: [PATCH] fix unexpected token --- packages/rocketchat-ui-master/server/dynamic-css.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/rocketchat-ui-master/server/dynamic-css.js b/packages/rocketchat-ui-master/server/dynamic-css.js index 2e4ef1b43e1..37acc385bce 100644 --- a/packages/rocketchat-ui-master/server/dynamic-css.js +++ b/packages/rocketchat-ui-master/server/dynamic-css.js @@ -150,14 +150,8 @@ export default () => { }, 100); DynamicCss = typeof DynamicCss !=='undefined'? DynamicCss : {}; -<<<<<<< HEAD DynamicCss.test = () => window.CSS && window.CSS.supports && window.CSS.supports('(--foo: red)'); DynamicCss.run = debounce((replace = false) => { - - -======= - DynamicCss.run = debounce((replace = false) => { ->>>>>>> 2aa991faeef52dd99e3e0bdde1aa04f5b0d110f7 if (replace) { document.querySelector('#css-variables').innerHTML = RocketChat.settings.get('theme-custom-variables'); }