Zaktualizuj 'lista.txt'

2019-01-24 21:28:49 +00:00
1 changed files with 1 additions and 4 deletions
--- a/lista.txt
+++ b/lista.txt
@ -1,6 +1,3 @@
-<<<<<<< HEAD
 1.Łukaszewska Kamilla
 2. Spaczyński Jonathan
-=======
-2. Spaczyński Jonathan
->>>>>>> 6a446033bc107e20e24bf3cb0ae5b6eda580b826
+3. Maciej Zaremba