diff options
Diffstat (limited to 'src/components/side_drawer/side_drawer.vue')
| -rw-r--r-- | src/components/side_drawer/side_drawer.vue | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 4a4e7610..0587ee02 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -86,27 +86,11 @@ </router-link> </li> <li -<<<<<<< HEAD v-if="chat" @click="toggleDrawer" > <router-link :to="{ name: 'chat' }"> <i class="button-icon icon-chat" /> {{ $t("nav.chat") }} -======= - v-if="currentUser || !privateMode" - @click="toggleDrawer" - > - <router-link to="/main/public"> - <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }} - </router-link> - </li> - <li - v-if="federating && (currentUser || !privateMode)" - @click="toggleDrawer" - > - <router-link to="/main/all"> - <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }} ->>>>>>> develop </router-link> </li> </ul> |