From 28ed038324cc84f8acc0de33446cef6ecb94dde1 Mon Sep 17 00:00:00 2001
From: Andre <andre.holger.hanke@mni.thm.de>
Date: Mon, 21 Oct 2019 15:37:21 +0200
Subject: [PATCH] Remove merge conflict leftovers
---
.../_dialogs/bonus-token/bonus-token.component.html | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html b/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
index d55e9b9ec..c33bbce9b 100644
--- a/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
+++ b/src/app/components/creator/_dialogs/bonus-token/bonus-token.component.html
@@ -1,13 +1,10 @@
-<<<<<<< HEAD
-<div mat-dialog-content>
-=======
+
<div mat-dialog-content xmlns="http://www.w3.org/1999/html">
->>>>>>> Semantic HTML in Dialogs
<h2>{{'room-page.bonus-token-header' | translate }}</h2>
<mat-divider></mat-divider>
<div *ngIf="bonusTokens.length >= 1">
<div fxLayout="row" *ngFor="let bonusToken of bonusTokens; index as i">
- <p>
+ <p tabindex="0">
{{bonusToken.token}}
</p>
<span class="fill-remaining-space"></span>
@@ -17,11 +14,7 @@
</div>
</div>
<div *ngIf="bonusTokens.length === 0">
-<<<<<<< HEAD
- <p>{{'room-page.no-bonus' | translate }}</p>
-=======
<p>{{'room-page.no-bonus' | translate }}<p>
->>>>>>> Semantic HTML in Dialogs
</div>
<div fxLayoutAlign="center center" *ngIf="bonusTokens.length > 1">
<button mat-button class="delete" (click)="openDeleteAllBonusDialog()">
--
GitLab