Resolve conflicts 2

2023-05-21 16:29:27 +03:00 · 2023-05-21 16:29:27 +03:00 · f3d1f11429
parent bf856625b5
commit f3d1f11429
2 changed files with 4 additions and 0 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
 [submodule "3dzavr"]
 	path = 3dzavr
 	url = https://github.com/vectozavr/3dzavr
--- a/1
+++ b/1
@ -0,0 +1 @@
 Subproject commit f80ebaf4522310a7560c19e6da2a3a8f36f2eb16
		`@ -0,0 +1 @@`
							`Subproject commit f80ebaf4522310a7560c19e6da2a3a8f36f2eb16`