IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Rigel Kent 2020-12-03 13:40:16 +01:00 committed by Chocobozzz
parent 92f62f108b
commit 2b6ea97f1c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/+about/about-follows/about-follows.component.html
View File

@ -23,14 +23,6 @@
<div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div> <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div>
<<<<<<< HEAD
||||||| parent of 932e04c48 (Change button)
<div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
=======
<div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div>
>>>>>>> 932e04c48 (Change button)
<a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer">
{{ following }} {{ following }}
</a> </a>