Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix missed conflict

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-07-14 11:54:03 +03:00
parent cac1418aff
commit 3598360ce5
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/side_drawer/side_drawer.vue
View file

@ -86,27 +86,11 @@
</router-link> </router-link>
</li> </li>
<li <li
<<<<<<< HEAD
v-if="chat" v-if="chat"
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'chat' }"> <router-link :to="{ name: 'chat' }">
<i class="button-icon icon-chat" /> {{ $t("nav.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> </router-link>
</li> </li>
</ul> </ul>