[ci skip] Fix conflict for app/assets/javascripts/ide/components/ide_side_bar.vue

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

@@ -73,12 +73,8 @@
         <div
           class="multi-file-loading-container"
           v-for="n in 3"
-<<<<<<< HEAD
-          :key="n">
-=======
           :key="n"
         >
->>>>>>> upstream/master
           <skeleton-loading-container />
         </div>
       </template>