fix(tasks): fix merge 🐛

weareopensource · Nov 22, 2019 · e3eeefa · e3eeefa
1 parent 6ac7000
commit e3eeefa
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/modules/tasks/views/task.view.vue b/src/modules/tasks/views/task.view.vue
@@ -6,13 +6,8 @@
         <v-icon class="mr-5">fa-check</v-icon>
         <b>1. Description</b>
       </v-subheader>
-<<<<<<< Updated upstream
-      <div class="flex-grow-1"></div>
-      <v-btn v-if="id" color="red lighten-3" @click="remove" icon>
-=======
       <v-spacer></v-spacer>
       <v-btn v-if="this.task.id" color="red lighten-3" @click="remove" icon>
->>>>>>> Stashed changes
         <v-icon>fa-trash</v-icon>
       </v-btn>
       <v-btn v-if="this.task.id" class="mr-5" color="blue lighten-2" @click="update()" :disabled="!save" icon>