Merge remote master to resolve unrelated historiesMerge branch 'master' of https://bdgit.educoder.net/pql56kzg7/software

Merge remote master to resolve unrelated histories# Please enter a commit message to explain why this merge is necessary,
7 months ago · 5b7d07c33c
parent ec24378759 464f40245b
commit 5b7d07c33c
4 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 76918f2c7f4bd4db4ad3877be1ee20c256446d21
--- a/doc/report.md
+++ b/doc/report.md
@ -0,0 +1 @@
+# Project Report
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 74694fe6ae5dfb4107fbca4431d6e7ea3361049f
--- a/src/main.py
+++ b/src/main.py
@ -0,0 +1 @@
+print('Hello from src/main.py')
				`@ -0,0 +1 @@`
				`Subproject commit 76918f2c7f4bd4db4ad3877be1ee20c256446d21`
				`@ -0,0 +1 @@`
				`Subproject commit 74694fe6ae5dfb4107fbca4431d6e7ea3361049f`