From b6aedfa902dffc12ee597d5c7a21234ee024962c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Wojdy=C5=82a?= <adawoj5@st.amu.edu.pl>
Date: Thu, 24 Jan 2019 20:02:07 +0000
Subject: [PATCH] Zaktualizuj 'lista.txt'

---
 lista.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lista.txt b/lista.txt
index 4963319..1a75b9f 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-1.Łukaszewska Kamilla
-2. Spaczyński Jonathan
-=======
-2. Spaczyński Jonathan
->>>>>>> 6a446033bc107e20e24bf3cb0ae5b6eda580b826
+Adam Wojdyła