From 2b6ea97f1c5f14608019b661ca4c4c8d86f46578 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Thu, 3 Dec 2020 13:40:16 +0100
Subject: [PATCH] fix merge conflicts

---
 .../app/+about/about-follows/about-follows.component.html | 8 --------
 1 file changed, 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 @@
 
     <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>
-- 
2.41.0