From 5da29961d442e6799560f68b792737d5b640eca9 Mon Sep 17 00:00:00 2001
From: Maksymilian Kulikowski <s463022@pcd3s.labs.wmi.amu.edu.pl>
Date: Thu, 28 Oct 2021 11:14:32 +0200
Subject: [PATCH] lista

---
 lista.txt | 75 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 11 deletions(-)

diff --git a/lista.txt b/lista.txt
index a7fe5b8..8f9a3bc 100644
--- a/lista.txt
+++ b/lista.txt
@@ -4,6 +4,69 @@ Lista obecnosci
 
 Lp., Imię, Nazwisko, Nr indeksu
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+1, Jeremi, Lisek, 464943
+>>>>>>> fecaec7c96318e0f0ddd9cac3995646d588bd18a
+=======
+=======
+=======
+>>>>>>> cf1285e485fa9e8cadd4c3e3f600322ed1f1ea3a
+1., Jan, Kemnitz, 464880
+2, Jeremi, Lisek, 464943
+3, Jeremi, Lisek, 464943
+4, Michał, Kamiński, 464945
+5, Gabriela, Piekarska, 464876
+6., Jakub, Prus, 464970
+7. Patrycja, Calkowska, 464889
+8. Aliaksei, Konyshau, 452730 
+<<<<<<< HEAD
+
+>>>>>>> c2ae2c4c332755ddc78087df08da090f94111cb6
+=======
+8. Aliaksandr, Trafimchyk, 464858
+
+>>>>>>> cf1285e485fa9e8cadd4c3e3f600322ed1f1ea3a
+=======
+>>>>>>> c3552a78f5f3c4f15247c652e53e516231856a9d
+1, Jeremi, Lisek, 464943
+2, Michał, Kamiński, 464945
+3, Gabriela, Piekarska, 464876
+4., Jakub, Prus, 464970
+<<<<<<< HEAD
+>>>>>>> b28e3175e70de7f3606b009689aae9b6ad776f6a
+>>>>>>> 29e24e534455527994181e3b2d28c6f2c487a50e
+5. Aleksandra Adamczak, 464973
+=======
+5. Patrycja, Calkowska, 464889 
+6. Aliaksei Kudravets, 464843
+<<<<<<< HEAD
+>>>>>>> c2ae2c4c332755ddc78087df08da090f94111cb6
+=======
+
+7. Jan Kaźmierczak, 464896
+>>>>>>> c3552a78f5f3c4f15247c652e53e516231856a9d
+=======
+=======
+1, Jeremi, Lisek, 464943
+>>>>>>> fecaec7c96318e0f0ddd9cac3995646d588bd18a
+=======
+1, Jeremi, Lisek, 464943
+2, Michał, Kamiński, 464945
+3, Gabriela, Piekarska, 464876
+>>>>>>> f9f23f5532246ca2aaeb103fa70e0eaf5f863243
+4., Jakub, Prus, 464970
+>>>>>>> b28e3175e70de7f3606b009689aae9b6ad776f6a
+5. Patrycja, Calkowska, 464889
+6. Filip Nowicki, 464915
+>>>>>>> a0761ed62de5973d1f7561743c35d1f19af9b129Lista obecnosci
+
+28.10.2021
+
+Lp., Imię, Nazwisko, Nr indeksu
+
 1., Jan, Kemnitz, 464880
 2, Jeremi, Lisek, 464943
 3, Jeremi, Lisek, 464943
@@ -12,14 +75,4 @@ Lp., Imię, Nazwisko, Nr indeksu
 6., Jakub, Prus, 464970
 7. Patrycja, Calkowska, 464889 
 8. Aliaksandr, Trafimchyk, 464858
-
-=======
->>>>>>> c3552a78f5f3c4f15247c652e53e516231856a9d
-1, Jeremi, Lisek, 464943
-2, Michał, Kamiński, 464945
-3, Gabriela, Piekarska, 464876
-4., Jakub, Prus, 464970
-5. Patrycja, Calkowska, 464889 
-6. Aliaksei Kudravets, 464843
-
-7. Jan Kaźmierczak, 464896
+9. Maksymilian, Kulikowski, 463022