summaryrefslogtreecommitdiff
path: root/source/features/resolve-conflicts.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'source/features/resolve-conflicts.tsx')
-rw-r--r--source/features/resolve-conflicts.tsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/features/resolve-conflicts.tsx b/source/features/resolve-conflicts.tsx
index b5320e6f..4b08a052 100644
--- a/source/features/resolve-conflicts.tsx
+++ b/source/features/resolve-conflicts.tsx
@@ -1,8 +1,8 @@
import './resolve-conflicts.css';
import React from 'dom-chef';
import elementReady from 'element-ready';
+import * as pageDetect from 'github-url-detection';
import features from '../libs/features';
-import * as pageDetect from '../libs/page-detect';
async function init(): Promise<void> {
await elementReady('.CodeMirror', {