Merge conflicts

Czesc 2:
2023-06-12 17:51:02 +02:00 · 2023-06-12 17:46:08 +02:00
2 changed files with 2 additions and 0 deletions
--- a/dane.txt
+++ b/dane.txt
@ -1,2 +1,3 @@
 Maciej Oboda
+2022/2023
 UAM
--- a/uczelnia/student.txt
+++ b/uczelnia/student.txt
@ -0,0 +1 @@
+444643
Author	SHA1	Message	Date
Maciej Oboda	f35ff5b609	Merge conflicts	2023-06-12 17:51:02 +02:00
Maciej Oboda	46b77e36b3	Czesc 2:	2023-06-12 17:46:08 +02:00