Remove conflict tag

2019-03-14 13:31:00 +00:00 · 2019-03-14 13:31:00 +00:00 · a5b9dbf5c0
commit a5b9dbf5c0
parent e8acc1d5c5
1 changed files with 0 additions and 1 deletions
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
  <div class="w-auto lg:w-56 bg-grey-3 text-grey-6 antialiased fixed pin-l h-full overflow-y-scroll z-30 -mt-2px">
    <div>
      <ul class="list-reset">