From f28d22ecb64b7d2160ca8a41f0ea83c5c6401dee Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 2 Dec 2018 16:43:23 +0100
Subject: [PATCH] Feat: first doughnut chart with chartjs

---
 src/views/home.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 0d74b89..c5d2018 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -21,13 +21,9 @@
        <box @click.native="set_postes_filter(['virements'])" postename="virements"></box>
      </b-card-group>
 
-<<<<<<< HEAD
      <postes-comparison></postes-comparison>
 
-    <b-table striped hover :items="filtered_rows(poste.words, poste.invert)" :fields='fields'>
-=======
     <b-table striped hover :items="filtered_rows" :fields='fields'>
->>>>>>> Feat: Tag filtering not on words
       <template slot="tags" slot-scope="data">
         <div v-for="tag in data.item.tags">
           <div v-if="tag.name !== 'Tout'">