Some more merge issues fixed, fixed webpack watch

3 files changed, 3 insertions, 12 deletions

diff --git a/Extensions/combined/src/bar.js b/Extensions/combined/src/bar.js
index 4e8369b..9f9e35f 100644
--- a/Extensions/combined/src/bar.js
+++ b/Extensions/combined/src/bar.js
@@ -1,8 +1,6 @@
 import { getButtons } from "./buttons";
-import { likesDisabledState, extConfig } from "./state";
+import { likesDisabledState, extConfig, isMobile } from "./state";
 import { cLog, getColorFromTheme } from "./utils";
-import { isMobile, likesDisabledState } from "./state";
-import { cLog } from "./utils";
 function createRateBar(likes, dislikes) {
   if (!likesDisabledState) {
     let rateBar = document.getElementById("ryd-bar-container");
diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js
index 8fc32b8..8654039 100644
--- a/Extensions/combined/src/utils.js
+++ b/Extensions/combined/src/utils.js
@@ -147,15 +147,8 @@ export {
   numberFormat,
   getBrowser,
   getVideoId,
-  isVideoLoaded,
-  cLog,
-  getColorFromTheme,
-};
-export {
-  numberFormat,
-  getBrowser,
-  getVideoId,
   isInViewport,
   isVideoLoaded,
   cLog,
+  getColorFromTheme,
 };
diff --git a/webpack.config.js b/webpack.config.js
index 2e6d80f..80e1877 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,7 +23,7 @@ module.exports = {
     minimize: false,
   },
   watchOptions: {
-    ignored: "./Extensions/combined/dist/*",
+    ignored: "**/dist/**",
   },
   plugins: [
     // exclude locale files in moment