From d218060fc5b87b7c8f6d3edca2a31d037ede9c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Stodolny?=
 <s125935@pcd1e.labs.wmi.amu.edu.pl>
Date: Sat, 18 Nov 2017 15:57:26 +0100
Subject: [PATCH] nowy

---
 test | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test b/test
index 29e7f0c..9a4ca81 100644
--- a/test
+++ b/test
@@ -1,9 +1,7 @@
 abc
 nowa linia
-<<<<<<< HEAD
 1235
 87654
-
-=======
 to jest kolejna linia do dodania
->>>>>>> 6ec80f589cc40981565228be3cbb234349595387
+no i nowe coś... i nowe
+