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

6665d3c8 · Filipa Lacerda · abdf5f38 · 6665d3c8
Commit 6665d3c8 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/ide/components/ide_side_bar.vue app/assets/javascripts/ide/components/ide_side_bar.vue +0 -4

No files found.
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/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>