summaryrefslogtreecommitdiff
path: root/source/features/conflict-marker.tsx
diff options
context:
space:
mode:
Diffstat (limited to 'source/features/conflict-marker.tsx')
-rw-r--r--source/features/conflict-marker.tsx1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/features/conflict-marker.tsx b/source/features/conflict-marker.tsx
index 5d17d6ab..0ef95cfc 100644
--- a/source/features/conflict-marker.tsx
+++ b/source/features/conflict-marker.tsx
@@ -3,6 +3,7 @@ import React from 'dom-chef';
import select from 'select-dom';
import AlertIcon from 'octicon/alert.svg';
import * as pageDetect from 'github-url-detection';
+
import * as api from '../libs/api';
import features from '../libs/features';