summaryrefslogtreecommitdiff
path: root/source/features/resolve-conflicts.tsx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/features/resolve-conflicts.tsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/features/resolve-conflicts.tsx b/source/features/resolve-conflicts.tsx
index 4cfba5f3..de364abd 100644
--- a/source/features/resolve-conflicts.tsx
+++ b/source/features/resolve-conflicts.tsx
@@ -4,7 +4,10 @@ import elementReady from 'element-ready';
import features from '../libs/features';
async function init(): Promise<void> {
- await elementReady('.CodeMirror'); // *Not* safeElementReady
+ await elementReady('.CodeMirror', {
+ stopOnDomReady: false
+ });
+
document.head.append(<script src={browser.runtime.getURL('resolve-conflicts.js')}/>);
}