From b0a075486773cf789519f7417355afaf79ca01cc Mon Sep 17 00:00:00 2001
From: lukas <lukas@noreply.code.curious.bio>
Date: Mon, 2 Jan 2023 17:27:35 +0100
Subject: [PATCH] merge conflict manuell beheben

---
 doc/assembly/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/assembly/README.md

diff --git a/doc/assembly/README.md b/doc/assembly/README.md
new file mode 100644
index 0000000..9130b29
--- /dev/null
+++ b/doc/assembly/README.md
@@ -0,0 +1,11 @@
+# README `doc/assembly/`
+
+Assembly instructions manual sources - Assembly means: You have all the parts available (bought, printed, milled, ...), and now want to put them together. So this is like a LEGO or IKEA manual. See also: doc/manuf/.
+
+Hier steht eine Beschreibung, wie man etwas ganz geheimes verstecken kann:
+<details><summary>CLICK ME</summary>
+Dieser Text wurde versteckt
+</details>
+
+Hat es funktioniert?
+