fixed IDE conflicts

app/assets/javascripts/ide/components/ide_project_tree.vue

 <script>
-<<<<<<< HEAD
-import projectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
-import branchesTree from './ide_project_branches_tree.vue';
-import externalLinks from './ide_external_links.vue';
-
-export default {
-  components: {
-    branchesTree,
-    externalLinks,
-    projectAvatarImage,
-=======
 import ProjectAvatarImage from '~/vue_shared/components/project_avatar/image.vue';
 import Identicon from '../../vue_shared/components/identicon.vue';
 import BranchesTree from './ide_project_branches_tree.vue';
@@ -21,7 +10,6 @@ export default {
     ExternalLinks,
     ProjectAvatarImage,
     Identicon,
->>>>>>> upstream/master
   },
   props: {
     project: {
@@ -39,14 +27,10 @@ export default {
         :title="project.name"
         :href="project.web_url"
       >
-<<<<<<< HEAD
-        <div class="avatar-container s40 project-avatar">
-=======
         <div
           v-if="project.avatar_url"
           class="avatar-container s40 project-avatar"
         >
->>>>>>> upstream/master
           <project-avatar-image
             class="avatar-container project-avatar"
             :link-href="project.path"
@@ -55,15 +39,12 @@ export default {
             :img-size="40"
           />
         </div>
-<<<<<<< HEAD
-=======
         <identicon
           v-else
           size-class="s40"
           :entity-id="project.id"
           :entity-name="project.name"
         />
->>>>>>> upstream/master
         <div class="sidebar-context-title">
           {{ project.name }}
         </div>

app/assets/javascripts/ide/components/repo_file.vue

@@ -43,10 +43,7 @@ export default {
         'file-open': this.isBlob && this.file.opened,
         'file-active': this.isBlob && this.file.active,
         folder: this.isTree,
-<<<<<<< HEAD
-=======
         'is-open': this.file.opened,
->>>>>>> upstream/master
       };
     },
   },

app/assets/javascripts/ide/ide_router.js

@@ -54,43 +54,6 @@ const router = new VueRouter({
 
 router.beforeEach((to, from, next) => {
   if (to.params.namespace && to.params.project) {
-<<<<<<< HEAD
-    store.dispatch('getProjectData', {
-      namespace: to.params.namespace,
-      projectId: to.params.project,
-    })
-    .then(() => {
-      const fullProjectId = `${to.params.namespace}/${to.params.project}`;
-
-      if (to.params.branch) {
-        store.dispatch('getBranchData', {
-          projectId: fullProjectId,
-          branchId: to.params.branch,
-        });
-
-        store.dispatch('getFiles', {
-          projectId: fullProjectId,
-          branchId: to.params.branch,
-        })
-        .then(() => {
-          if (to.params[0]) {
-            const treeEntry = store.state.entries[to.params[0]];
-            if (treeEntry) {
-              store.dispatch('handleTreeEntryAction', treeEntry);
-            }
-          }
-        })
-        .catch((e) => {
-          flash('Error while loading the branch files. Please try again.', 'alert', document, null, false, true);
-          throw e;
-        });
-      }
-    })
-    .catch((e) => {
-      flash('Error while loading the project data. Please try again.', 'alert', document, null, false, true);
-      throw e;
-    });
-=======
     store
       .dispatch('getProjectData', {
         namespace: to.params.namespace,
@@ -146,7 +109,6 @@ router.beforeEach((to, from, next) => {
         );
         throw e;
       });
->>>>>>> upstream/master
   }
 
   next();

app/assets/javascripts/ide/stores/workers/files_decorator_worker.js

-<<<<<<< HEAD
-import {
-  decorateData,
-  sortTree,
-} from '../utils';
-
-self.addEventListener('message', (e) => {
-  const { data, projectId, branchId, tempFile = false, content = '', base64 = false } = e.data;
-=======
 import { decorateData, sortTree } from '../utils';
 
 self.addEventListener('message', e => {
@@ -18,7 +9,6 @@ self.addEventListener('message', e => {
     content = '',
     base64 = false,
   } = e.data;
->>>>>>> upstream/master
 
   const treeList = [];
   let file;
@@ -29,13 +19,9 @@ self.addEventListener('message', e => {
     if (pathSplit.length > 0) {
       pathSplit.reduce((pathAcc, folderName) => {
         const parentFolder = acc[pathAcc[pathAcc.length - 1]];
-<<<<<<< HEAD
-        const folderPath = `${(parentFolder ? `${parentFolder.path}/` : '')}${folderName}`;
-=======
         const folderPath = `${
           parentFolder ? `${parentFolder.path}/` : ''
         }${folderName}`;
->>>>>>> upstream/master
         const foundEntry = acc[folderPath];
 
         if (!foundEntry) {
@@ -45,17 +31,11 @@ self.addEventListener('message', e => {
             id: folderPath,
             name: folderName,
             path: folderPath,
-<<<<<<< HEAD
-            url: `/${projectId}/tree/${branchId}/${folderPath}`,
-            type: 'tree',
-            parentTreeUrl: parentFolder ? parentFolder.url : `/${projectId}/tree/${branchId}/`,
-=======
             url: `/${projectId}/tree/${branchId}/${folderPath}/`,
             type: 'tree',
             parentTreeUrl: parentFolder
               ? parentFolder.url
               : `/${projectId}/tree/${branchId}/`,
->>>>>>> upstream/master
             tempFile,
             changed: tempFile,
             opened: tempFile,
@@ -90,13 +70,9 @@ self.addEventListener('message', e => {
         path,
         url: `/${projectId}/blob/${branchId}/${path}`,
         type: 'blob',
-<<<<<<< HEAD
-        parentTreeUrl: fileFolder ? fileFolder.url : `/${projectId}/blob/${branchId}`,
-=======
         parentTreeUrl: fileFolder
           ? fileFolder.url
           : `/${projectId}/blob/${branchId}`,
->>>>>>> upstream/master
         tempFile,
         changed: tempFile,
         content,

app/views/projects/tree/_tree_header.html.haml

@@ -79,11 +79,7 @@
   = render 'projects/find_file_link'
 
   = succeed " " do
-<<<<<<< HEAD
-    = link_to ide_edit_path(@project, @id), class: 'btn btn-default' do
-=======
     = link_to ide_edit_path(@project, @id, ""), class: 'btn btn-default' do
->>>>>>> upstream/master
       = _('Web IDE')
 
   = render 'projects/buttons/download', project: @project, ref: @ref