From 50953df133bc602e3f341695f7318763ed9f7222 Mon Sep 17 00:00:00 2001
From: Maciej Zaremba <maczar@st.amu.edu.pl>
Date: Thu, 24 Jan 2019 21:28:49 +0000
Subject: [PATCH] Zaktualizuj 'lista.txt'

---
 lista.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lista.txt b/lista.txt
index 4963319..386f60d 100644
--- 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
\ No newline at end of file