diff --git a/dane.txt b/dane.txt
index 62c74a0..7e41e83 100644
--- a/dane.txt
+++ b/dane.txt
@@ -1,6 +1,3 @@
 Adam Wereszczyński
-<<<<<<< HEAD
 Uniwersytet im. Adama Mickiewicza
-=======
 rok akademicki 2021/2022
->>>>>>> uam