From 7224fd7cf7d300ec3c74ce8b2c406f87aa390ebd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 12 Apr 2022 16:21:26 +0200
Subject: [PATCH] resolve conflict

---
 frontend/src/pages/Transactions.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/frontend/src/pages/Transactions.vue b/frontend/src/pages/Transactions.vue
index 5fc14788b..59bf5101e 100644
--- a/frontend/src/pages/Transactions.vue
+++ b/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>