Merge conflicts

czesc 2
2023-06-12 17:51:02 +02:00 · 2023-06-12 17:43:25 +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/info/zajecia.txt
+++ b/info/zajecia.txt
@ -0,0 +1 @@
+pon, 12 cze 2023, 17:38:35 CEST
Author	SHA1	Message	Date
Maciej Oboda	f35ff5b609	Merge conflicts	2023-06-12 17:51:02 +02:00
Maciej Oboda	a526ce38de	czesc 2	2023-06-12 17:43:25 +02:00