From 35983aaa6da7b0f9e06423203f444ca59b907820 Mon Sep 17 00:00:00 2001
From: Anna Maduzia <annmad@st.amu.edu.pl>
Date: Sat, 7 Dec 2019 20:12:08 +0000
Subject: [PATCH] Poprawiony konflikt

---
 .../single-choice/single-choice.component.html              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
index 2b10b6c..4fce135 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
@@ -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" >