Resolved conflict

2023-12-04 12:44:09 +02:00 · 2023-12-04 12:44:09 +02:00 · 2023-12-04 11:06:23 +02:00
diff --git a/Maksims Stogovs b/Maksims Stogovs
Maksims Stogovs 7d08dd3b71 Resolved conflict		2023-12-04 12:44:09 +02:00
func.py	Resolved conflict	2023-12-04 12:44:09 +02:00
main.py	Added greetings to Riga	2023-12-04 11:06:23 +02:00