resolve conflict

frontend/src/pages/Transactions.vue

@@ -56,18 +56,6 @@ export default {
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)
     },
-<<<<<<< HEAD
-    showGdtBalance(boolean) {
-      if (Boolean) {
-        this.titel_gdt += `( ${
-          this.GdtBalance === null ? '—' : this.$n(this.GdtBalance, 'decimal')
-        } GDT)`
-      } else {
-        this.titel_gdt = this.$t('gdt.gdt')
-      }
-    },
-=======
->>>>>>> 183eb0bbf (remove function from tab)
   },
 }
 </script>