diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-04 13:57:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-04 13:57:41 +0100 |
| commit | 64807dd87a160a716ad28d4a593a35d7fb6d1e5c (patch) | |
| tree | a53ee0f745f7d8207290e74b2f677122d64e45e8 | |
| parent | d9f3af500c1c3135a63014904459e5a4ab6bc395 (diff) | |
| download | gitlab-ce-64807dd87a160a716ad28d4a593a35d7fb6d1e5c.tar.gz | |
removed conflict markers
| -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; |