fix merge conflicts

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 a05c40184843cb6b717dc6aa2935fe4231d654ef..438e836e0925ec5a4fb955fe200ac8388cd859af 100644 (file)
--- 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 @@
 
     <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">
       {{ following }}
     </a>