From 52fe1f90e5cd8d942cadf46a6f74d513b828dac7 Mon Sep 17 00:00:00 2001
From: mohammad <mohammad.alayoub@mni.thm.de>
Date: Sun, 16 May 2021 22:13:04 +0200
Subject: [PATCH] fixed error in the html

---
 .../topic-cloud-administration.component.html                  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index 1eae66326..f8957b927 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -39,12 +39,9 @@
           <span *ngIf="lang.lang == 'spacyfrage'">spacy keyword</span>
         </mat-option>
       </mat-select-->
-<<<<<<< HEAD
       <!-- <mat-form-field>
-=======
     <div>
       <mat-form-field>
->>>>>>> added panel fir adding new bad word to the list
         <mat-label>key wählen</mat-label>
         <mat-select [(ngModel)]="selectedLang">
           <mat-option *ngFor="let team of commentLang" [value]="team.lang">
-- 
GitLab