diff options
Diffstat (limited to 'app/assets/javascripts/ide/stores/getters.js')
| -rw-r--r-- | app/assets/javascripts/ide/stores/getters.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/stores/getters.js b/app/assets/javascripts/ide/stores/getters.js index 80de60799f2..e1ee8047e13 100644 --- a/app/assets/javascripts/ide/stores/getters.js +++ b/app/assets/javascripts/ide/stores/getters.js @@ -1,9 +1,5 @@ -<<<<<<< HEAD -import { activityBarViews } from '../constants'; -======= -import { __ } from '~/locale'; import { getChangesCountForFiles, filePathMatches } from './utils'; ->>>>>>> master +import { activityBarViews } from '../constants'; export const activeFile = state => state.openFiles.find(file => file.active) || null; |