removed conflict markers

64807dd8 · Phil Hughes · d9f3af50 · 64807dd8
Commit 64807dd8 authored May 04, 2018 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

app/assets/javascripts/ide/stores/getters.js app/assets/javascripts/ide/stores/getters.js +1 -5

No files found.
--- a/app/assets/javascripts/ide/stores/getters.js
+++ b/app/assets/javascripts/ide/stores/getters.js
-<<<<<<< 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;