From 980920b1af5341821af7f413500ce95edcc0b7cd Mon Sep 17 00:00:00 2001 From: Maciej Mrowicki Date: Fri, 18 Jan 2019 11:02:07 +0000 Subject: [PATCH 1/4] Update 'lista.txt' --- lista.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lista.txt b/lista.txt index e69de29..1510c58 100644 --- a/lista.txt +++ b/lista.txt @@ -0,0 +1 @@ +1. Mrowicki Maciej \ No newline at end of file -- 2.20.1 From 87b2a015300722229f84ef61cca9313a43120c92 Mon Sep 17 00:00:00 2001 From: Maciej Mrowicki Date: Fri, 18 Jan 2019 11:07:46 +0000 Subject: [PATCH 2/4] Delete 'lista.txt' --- lista.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lista.txt diff --git a/lista.txt b/lista.txt deleted file mode 100644 index 1510c58..0000000 --- a/lista.txt +++ /dev/null @@ -1 +0,0 @@ -1. Mrowicki Maciej \ No newline at end of file -- 2.20.1 From e6f02e8716e92a551e232d32318a5bad1033dabd Mon Sep 17 00:00:00 2001 From: Maciej Mrowicki Date: Fri, 18 Jan 2019 12:17:00 +0100 Subject: [PATCH 3/4] komentarz --- lista.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lista.txt b/lista.txt index e69de29..3f20d9f 100644 --- a/lista.txt +++ b/lista.txt @@ -0,0 +1 @@ +1.Mrowicki Maciej -- 2.20.1 From e7b862458bc1f5fbc65d56c1afd20f80a275560b Mon Sep 17 00:00:00 2001 From: Maciej Mrowicki Date: Fri, 18 Jan 2019 12:29:23 +0100 Subject: [PATCH 4/4] 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 -- 2.20.1