From 8ccbffcb9f5f2adf3a1bdfd20f19c19a8cb57cdd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Sep 2021 08:25:36 +0200
Subject: [PATCH] after remove conflicts, fix lint

---
 frontend/src/store/store.js                      | 2 +-
 frontend/src/views/Pages/UserProfileOverview.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 7a54e608c..5bb55c9d8 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -68,7 +68,7 @@ export const store = new Vuex.Store({
     description: '',
     token: null,
     coinanimation: true,
-    newsletterState: null
+    newsletterState: null,
   },
   getters: {},
   // Syncronous mutation of the state
diff --git a/frontend/src/views/Pages/UserProfileOverview.vue b/frontend/src/views/Pages/UserProfileOverview.vue
index 9e3134dc3..2f2946e38 100644
--- a/frontend/src/views/Pages/UserProfileOverview.vue
+++ b/frontend/src/views/Pages/UserProfileOverview.vue
@@ -5,7 +5,7 @@
     <hr />
     <form-user-passwort />
     <hr />
-    <form-user-language />    
+    <form-user-language />
     <hr />
     <form-user-newsletter />
     <hr />
@@ -25,7 +25,7 @@ export default {
     UserCard,
     FormUserData,
     FormUserPasswort,
-    FormUserLanguage,    
+    FormUserLanguage,
     FormUserNewsletter,
     FormUserCoinAnimation,
   },