s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Poprawiony konflikt

This commit is contained in:
Anna Maduzia 2019-12-07 20:12:08 +00:00
parent b1a4945768
commit 35983aaa6d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
View File

@ -1,11 +1,7 @@
<form #f="ngForm" (ngSubmit)="nextQuestion(f)" novalidate>
<div class="alert alert-grey question">
<<<<<<< HEAD
Pytanie za {{question.points}}pkt. <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
Pytanie za {{question.points}}pkt. <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="question.time === 0">Czas: bez limitu</span>
<div class="pytanie">{{question.question}} </div>
=======
{{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="question.time === 0">Czas: bez limitu</span>
>>>>>>> d8c503bda71c21574ee646fe2cf8c3cb2f8546bd
<div class="answers">
<div *ngFor="let item of question.answers" >