From e7b862458bc1f5fbc65d56c1afd20f80a275560b Mon Sep 17 00:00:00 2001
From: Maciej Mrowicki <s444448@pcd1u.labs.wmi.amu.edu.pl>
Date: Fri, 18 Jan 2019 12:29:23 +0100
Subject: [PATCH] Juz umiem

---
 lista.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lista.txt b/lista.txt
index 3666628..b486e4d 100644
--- a/lista.txt
+++ b/lista.txt
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-1.Mrowicki Maciej
-=======
-1. Biadała Magdalena
->>>>>>> 12e346e722bf82523ace08f2ba9a622a994d7c3e
+1.Biadała Magdalena
+2.Mrowicki Maciej