Merge conflicts

This commit is contained in:
Maciej Oboda 2023-06-12 17:51:02 +02:00
commit f35ff5b609
2 changed files with 2 additions and 0 deletions

View File

@ -1,2 +1,3 @@
Maciej Oboda Maciej Oboda
2022/2023 2022/2023
UAM

1
info/zajecia.txt Normal file
View File

@ -0,0 +1 @@
pon, 12 cze 2023, 17:38:35 CEST