From 4dffa377cc312742d39673b160e4fdff58659a6e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 13 Jul 2022 08:57:38 +0200
Subject: [PATCH] resolve merge conflict

---
 frontend/src/components/Menu/Sidebar.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index f1e582356..b54eb541e 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -16,14 +16,14 @@
             <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
             {{ $t('navigation.transactions') }}
           </b-nav-item>
-          <b-nav-item to="/profile" class="mb-3">
-            <b-icon icon="gear" aria-hidden="true"></b-icon>
-            {{ $t('navigation.profile') }}
-          </b-nav-item>
           <b-nav-item to="/community" class="mb-3">
             <b-icon icon="people" aria-hidden="true"></b-icon>
             {{ $t('navigation.community') }}
           </b-nav-item>
+          <b-nav-item to="/profile" class="mb-3">
+            <b-icon icon="gear" aria-hidden="true"></b-icon>
+            {{ $t('navigation.profile') }}
+          </b-nav-item>
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">