blob: 81e557ac2d1b1ee660d39aa807eecd390e5ba73d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
import './resolve-conflicts.css';
import React from 'dom-chef';
import elementReady from 'element-ready';
import features from '../libs/features';
async function init(): Promise<void> {
await elementReady('.CodeMirror', {
stopOnDomReady: false
});
document.head.append(<script src={browser.runtime.getURL('resolve-conflicts.js')}/>);
}
features.add({
id: __featureName__,
description: 'Fix merge conflicts in a click',
screenshot: false,
include: [
features.isConflict
],
load: features.onAjaxedPages,
init
});
|