diff options
| author | Rigel Kent <sendmemail@rigelk.eu> | 2020-12-03 13:40:16 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-12-14 09:57:41 +0100 |
| commit | 2b6ea97f1c5f14608019b661ca4c4c8d86f46578 (patch) | |
| tree | d9cea9434672587eb4c1b79b4b130ffa6775a318 | |
| parent | 92f62f108bafac45546dbd3c6e64da769f2a4908 (diff) | |
| download | PeerTube-2b6ea97f1c5f14608019b661ca4c4c8d86f46578.tar.gz PeerTube-2b6ea97f1c5f14608019b661ca4c4c8d86f46578.tar.zst PeerTube-2b6ea97f1c5f14608019b661ca4c4c8d86f46578.zip | |
fix merge conflicts
| -rw-r--r-- | client/src/app/+about/about-follows/about-follows.component.html | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/client/src/app/+about/about-follows/about-follows.component.html b/client/src/app/+about/about-follows/about-follows.component.html index a05c40184..438e836e0 100644 --- a/client/src/app/+about/about-follows/about-follows.component.html +++ b/client/src/app/+about/about-follows/about-follows.component.html | |||
| @@ -23,14 +23,6 @@ | |||
| 23 | 23 | ||
| 24 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div> | 24 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance is not following any other.</div> |
| 25 | 25 | ||
| 26 | <<<<<<< HEAD | ||
| 27 | ||||||| parent of 932e04c48 (Change button) | ||
| 28 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div> | ||
| 29 | |||
| 30 | ======= | ||
| 31 | <div i18n class="no-results" *ngIf="followingsPagination.totalItems === 0">This instance does not have instances followings.</div> | ||
| 32 | |||
| 33 | >>>>>>> 932e04c48 (Change button) | ||
| 34 | <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> | 26 | <a *ngFor="let following of followings" [href]="buildLink(following)" target="_blank" rel="noopener noreferrer"> |
| 35 | {{ following }} | 27 | {{ following }} |
| 36 | </a> | 28 | </a> |