From 38c20957ce5455dfd82e6c2db65dcc3a6dc3b67a Mon Sep 17 00:00:00 2001 From: jan kemnitz Date: Thu, 28 Oct 2021 10:11:33 +0200 Subject: [PATCH 01/11] lista jankem --- lista.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lista.txt b/lista.txt index 0167dc5..fd36eb2 100644 --- a/lista.txt +++ b/lista.txt @@ -2,4 +2,5 @@ Lista obecnosci 28.10.2021 -Lp., Imię, Nazwisko, Nr indeksu \ No newline at end of file +Lp., Imię, Nazwisko, Nr indeksu +1., Jan, Kemnitz, 464880 \ No newline at end of file From 7d53f2d663ca0580f54669ba44226cfa112cf712 Mon Sep 17 00:00:00 2001 From: Jankaz2 Date: Thu, 28 Oct 2021 10:15:08 +0200 Subject: [PATCH 02/11] Jan Kazmierczak obecny --- lista.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lista.txt b/lista.txt index 0167dc5..4fa0c61 100644 --- a/lista.txt +++ b/lista.txt @@ -2,4 +2,7 @@ Lista obecnosci 28.10.2021 -Lp., Imię, Nazwisko, Nr indeksu \ No newline at end of file +Lp., Imię, Nazwisko, Nr indeksu + + +Jan Kaźmierczak s464896 \ No newline at end of file From 7a36ae7cba33c139fc1226d3eacbd47800d56ba8 Mon Sep 17 00:00:00 2001 From: Aleksandra Adamczak Date: Thu, 28 Oct 2021 10:37:13 +0200 Subject: [PATCH 03/11] =?UTF-8?q?Obecno=C5=9B=C4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lista.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lista.txt b/lista.txt index 0167dc5..452b92e 100644 --- a/lista.txt +++ b/lista.txt @@ -2,4 +2,5 @@ Lista obecnosci 28.10.2021 -Lp., Imię, Nazwisko, Nr indeksu \ No newline at end of file +Lp., Imię, Nazwisko, Nr indeksu +1. Aleksandra Adamczak, 464973 From a659d02f6f30f4db3f82d0413494b0a30b5e8890 Mon Sep 17 00:00:00 2001 From: s464896 Date: Thu, 28 Oct 2021 10:49:01 +0200 Subject: [PATCH 04/11] usunalem swoje dane zeby dodac na branchu i spushowac ze swojego brancha --- lista.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lista.txt b/lista.txt index 4fa0c61..0167dc5 100644 --- a/lista.txt +++ b/lista.txt @@ -2,7 +2,4 @@ Lista obecnosci 28.10.2021 -Lp., Imię, Nazwisko, Nr indeksu - - -Jan Kaźmierczak s464896 \ No newline at end of file +Lp., Imię, Nazwisko, Nr indeksu \ No newline at end of file From a0761ed62de5973d1f7561743c35d1f19af9b129 Mon Sep 17 00:00:00 2001 From: s464915 Date: Thu, 28 Oct 2021 10:57:54 +0200 Subject: [PATCH 05/11] lista --- lista.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lista.txt b/lista.txt index 0167dc5..dfc792b 100644 --- a/lista.txt +++ b/lista.txt @@ -2,4 +2,18 @@ Lista obecnosci 28.10.2021 -Lp., Imię, Nazwisko, Nr indeksu \ No newline at end of file +Lp., Imię, Nazwisko, Nr indeksu +<<<<<<< HEAD +<<<<<<< HEAD +======= +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 From c2ae2c4c332755ddc78087df08da090f94111cb6 Mon Sep 17 00:00:00 2001 From: s464880 Date: Thu, 28 Oct 2021 10:59:45 +0200 Subject: [PATCH 06/11] jankem --- lista.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/lista.txt b/lista.txt index 8fb29a9..91b66f2 100644 --- a/lista.txt +++ b/lista.txt @@ -3,7 +3,6 @@ Lista obecnosci 28.10.2021 Lp., Imię, Nazwisko, Nr indeksu -<<<<<<< HEAD 1., Jan, Kemnitz, 464880 2, Jeremi, Lisek, 464943 3, Jeremi, Lisek, 464943 @@ -12,8 +11,6 @@ Lp., Imię, Nazwisko, Nr indeksu 6., Jakub, Prus, 464970 7. Patrycja, Calkowska, 464889 -1, Jeremi, Lisek, 464943 - 1, Jeremi, Lisek, 464943 2, Michał, Kamiński, 464945 3, Gabriela, Piekarska, 464876 From 283549f6145077aa2cb54bcfa147ec2828e73cfb Mon Sep 17 00:00:00 2001 From: Jankaz Date: Thu, 28 Oct 2021 10:59:52 +0200 Subject: [PATCH 07/11] commit --- lista.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lista.txt b/lista.txt index cd3ab7e..849b09f 100644 --- a/lista.txt +++ b/lista.txt @@ -3,17 +3,12 @@ Lista obecnosci 28.10.2021 Lp., Imię, Nazwisko, Nr indeksu -<<<<<<< HEAD -<<<<<<< HEAD -======= 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. Aliaksei Kudravets, 464843 \ No newline at end of file +6. Aliaksei Kudravets, 464843 + +7. Jan Kaźmierczak, 464896 \ No newline at end of file From a2632c5a4012c3538374ab307e7cebaa4c68e8b6 Mon Sep 17 00:00:00 2001 From: s464858 Date: Thu, 28 Oct 2021 11:01:29 +0200 Subject: [PATCH 08/11] vers1.1 --- lista.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lista.txt b/lista.txt index 91b66f2..757dc0e 100644 --- a/lista.txt +++ b/lista.txt @@ -10,6 +10,7 @@ Lp., Imię, Nazwisko, Nr indeksu 5, Gabriela, Piekarska, 464876 6., Jakub, Prus, 464970 7. Patrycja, Calkowska, 464889 +8. Aliaksandr, Trafimchyk, 464858 1, Jeremi, Lisek, 464943 2, Michał, Kamiński, 464945 From 2069c610b6e72f6df0eb80d95d10bee2ad73b50f Mon Sep 17 00:00:00 2001 From: Aliaksei Konyshau Date: Thu, 28 Oct 2021 11:08:26 +0200 Subject: [PATCH 09/11] yes --- lista.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lista.txt b/lista.txt index e23b971..9168b4d 100644 --- a/lista.txt +++ b/lista.txt @@ -19,7 +19,8 @@ Lp., Imię, Nazwisko, Nr indeksu 4, Michał, Kamiński, 464945 5, Gabriela, Piekarska, 464876 6., Jakub, Prus, 464970 -7. Patrycja, Calkowska, 464889 +7. Patrycja, Calkowska, 464889 +8. Aliaksei, Konyshau, 452730 <<<<<<< HEAD >>>>>>> c2ae2c4c332755ddc78087df08da090f94111cb6 From 8c03bb98527d2aa83dc49ef3cbdb6ee4b9f76ac2 Mon Sep 17 00:00:00 2001 From: Konrad Przybysz Date: Thu, 28 Oct 2021 11:09:29 +0200 Subject: [PATCH 10/11] kp --- lista.txt | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/lista.txt b/lista.txt index e23b971..e003ad9 100644 --- a/lista.txt +++ b/lista.txt @@ -3,16 +3,7 @@ Lista obecnosci 28.10.2021 Lp., Imię, Nazwisko, Nr indeksu -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD 1, Jeremi, Lisek, 464943 ->>>>>>> fecaec7c96318e0f0ddd9cac3995646d588bd18a -======= -======= -======= ->>>>>>> cf1285e485fa9e8cadd4c3e3f600322ed1f1ea3a 1., Jan, Kemnitz, 464880 2, Jeremi, Lisek, 464943 3, Jeremi, Lisek, 464943 @@ -20,29 +11,13 @@ Lp., Imię, Nazwisko, Nr indeksu 5, Gabriela, Piekarska, 464876 6., Jakub, Prus, 464970 7. Patrycja, Calkowska, 464889 -<<<<<<< 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 +8. Konrad Przybysz, 462027 From e1386a17726d962a3acb7742bb5108cdcc00b0f2 Mon Sep 17 00:00:00 2001 From: Szymon Bartanowicz Date: Thu, 28 Oct 2021 11:13:25 +0200 Subject: [PATCH 11/11] Szymon Bartanowicz --- lista.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lista.txt b/lista.txt index 114b733..49288b6 100644 --- a/lista.txt +++ b/lista.txt @@ -56,3 +56,4 @@ Lp., Imię, Nazwisko, Nr indeksu 6. Filip Nowicki, 464915 >>>>>>> a0761ed62de5973d1f7561743c35d1f19af9b129 >>>>>>> 6be66ceeec17bcf9748beeccc9df21d292fd1670 +8. Szymon Bartanowicz 464937