diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:54:03 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-14 11:54:03 +0300 |
| commit | 3598360ce55bf7701716a9974599f901ddb66bf7 (patch) | |
| tree | 88d01d2d139aa64b16ce7790fd5532c7a21b5112 /src/components/side_drawer/side_drawer.vue | |
| parent | cac1418affbc0ae91bce2a4d4c14046e73484116 (diff) | |
fix missed conflict
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> |