Merge pull request #2633 from mneunomne/master

fix merge issues

Author: mneunomne

src/js/start.js

@@ -54,7 +54,6 @@ import { redirectEngine } from './redirect-engine.js';
 import staticExtFilteringEngine from './static-ext-filtering.js';
 import staticFilteringReverseLookup from './reverselookup.js';
 import staticNetFilteringEngine from './static-net-filtering.js';
-import { ubolog } from './console.js';
 import webRequest from './traffic.js';
 import µb from './background.js';
 

src/js/ublock.js

@@ -52,7 +52,6 @@ import contextMenu from './contextmenu.js';
 import cosmeticFilteringEngine from './cosmetic-filtering.js';
 import { hostnameFromURI } from './uri-utils.js';
 import { redirectEngine } from './redirect-engine.js';
-import µb from './background.js';
 
 /******************************************************************************/
 /******************************************************************************/