commit po konflikcie

Merge branch 'uam'
commit w 2 galezi dane
2023-06-13 18:08:29 +02:00 · 2023-06-13 17:57:24 +02:00 · 2023-06-13 17:48:32 +02:00 · 2023-06-13 17:46:03 +02:00 · 2023-06-13 12:46:14 +02:00 · 2023-06-13 12:02:25 +02:00
3 changed files with 8 additions and 1 deletions
--- a/dane.txt
+++ b/dane.txt
@ -1 +1,6 @@
-Adam Owczarek
+Adam Owczarek
+
+Rok Akademicki 2022/2023
+
+Uniwersytet Adama Mickiewicza w Poznaniu
+
--- a/info/zajecia.txt
+++ b/info/zajecia.txt
@ -0,0 +1 @@
+13.06.2023
--- a/uczelnia/student.txt
+++ b/uczelnia/student.txt
@ -0,0 +1 @@
+462134
Author	SHA1	Message	Date
Adam Owczarek	729459a0bf	commit po konflikcie	2023-06-13 18:08:29 +02:00
Adam Owczarek	3574f5f73f	Merge branch 'uam'	2023-06-13 17:57:24 +02:00
Adam Owczarek	52e834cbb2	commit w 2 galezi dane	2023-06-13 17:48:32 +02:00
Adam Owczarek	a0ee02eb0c	commit w 2 gałezi	2023-06-13 17:46:03 +02:00
Adam Owczarek	8500d5cdfa	comit zajecia	2023-06-13 12:46:14 +02:00
Adam Owczarek	9843ca75d1	commit zajecia	2023-06-13 12:02:25 +02:00