Commit 9424e052 authored by Phil Hughes's avatar Phil Hughes

resolved repo components

[ci skip]
parent 98da16a0
......@@ -54,14 +54,10 @@
<tr
class="file"
@click.prevent="clickedTreeRow(file)">
<<<<<<< HEAD
<td :colspan="submoduleColSpan">
=======
<td
class="multi-file-table-col-name"
:colspan="submoduleColSpan"
>
>>>>>>> upstream/master
<i
class="fa fa-fw file-icon"
:class="fileIcon"
......
......@@ -19,11 +19,7 @@
class="loading-file"
aria-label="Loading files"
>
<<<<<<< HEAD
<td>
=======
<td class="multi-file-table-col-name">
>>>>>>> upstream/master
<skeleton-loading-container
:small="true"
/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment