From 27b0f6227477d4558b301202f59504d12bc0f029 Mon Sep 17 00:00:00 2001
From: "Adrian A. Baumann" <ade@adebaumann.com>
Date: Tue, 21 Oct 2025 23:46:17 +0200
Subject: [PATCH] Readme added

---
 .gitignore | 7 +++++++
 README.md  | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/.gitignore b/.gitignore
index 406784b..10b1fd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,13 @@ keys/
 .idea/
 
 *.kate-swp
+<<<<<<< HEAD
 
 # Diagram cache directory
 media/diagram_cache/
+=======
+.env
+node_modules/
+package-lock.json
+package.json
+>>>>>>> 299c046 (Readme added)
diff --git a/README.md b/README.md
index ccb14d3..002a8a6 100644
--- a/README.md
+++ b/README.md
@@ -2,5 +2,8 @@
 
 There are examples for importing text in the "Documentation"-directory. Actual documentation follows.
 
+<<<<<<< HEAD
 Documentation on Confluence so far.
 This commit should be signed.
+=======
+>>>>>>> 299c046 (Readme added)