From f3d1f11429649786f3091710fccae8cfa87a46a9 Mon Sep 17 00:00:00 2001
From: Vectozavr <60608292+vectozavr@users.noreply.github.com>
Date: Sun, 21 May 2023 16:29:27 +0300
Subject: [PATCH] Resolve conflicts 2

---
 .gitmodules | 3 +++
 3dzavr      | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 3dzavr

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..566e10e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3dzavr"]
+	path = 3dzavr
+	url = https://github.com/vectozavr/3dzavr
diff --git a/3dzavr b/3dzavr
new file mode 160000
index 0000000..f80ebaf
--- /dev/null
+++ b/3dzavr
@@ -0,0 +1 @@
+Subproject commit f80ebaf4522310a7560c19e6da2a3a8f36f2eb16