Merge pull request 'new_feature2' (#1 ) from new_feature2 into master

Reviewed-on: #1
Resolve merge conflict in Readme.txt on new_feature2
2025-10-16 11:43:57 +00:00 · 2025-10-16 13:42:35 +02:00 · 2025-10-16 11:35:31 +00:00
1 changed files with 5 additions and 1 deletions
--- a/demo/Readme.txt
+++ b/demo/Readme.txt
@@ -1 +1,5 @@
-//edycja 2
+<<<<<<< HEAD
+//edycja
+=======
+//edycja 2
+>>>>>>> 61d8f4f1af7e0671dbe044459f15a399c0d2afab
Author	SHA1	Message	Date
JakubGorecki	22c4fc92ff	Merge pull request 'new_feature2' (#1 ) from new_feature2 into master Reviewed-on: #1	2025-10-16 11:43:57 +00:00
Jakub Góreckii	56cb25011c	Resolve merge conflict in Readme.txt on new_feature2	2025-10-16 13:42:35 +02:00
JakubGorecki	1a04d2b250	Update demo/Readme.txt	2025-10-16 11:35:31 +00:00