Merge branch 'feature/gitops'

One more Pre-merge commit
Pre-merge commit
2025-11-06 23:11:13 +01:00 · 2025-11-06 16:00:38 +01:00 · 2025-11-06 15:57:29 +01:00 · 2025-11-04 16:53:31 +01:00
2 changed files with 5 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,10 +9,9 @@ keys/
 .venv/
 .idea/
 *.kate-swp
+media/diagram_cache/
+.env
 node_modules/
 package-lock.json
 package.json
-# Diagram cache directory
-media/diagram_cache/
-.env
 data/db.sqlite3
--- 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)
Author	SHA1	Message	Date
Adrian A. Baumann	ae657d1b03	Merge branch 'feature/gitops'	2025-11-06 23:11:13 +01:00
Adrian A. Baumann	ff652d6f90	One more Pre-merge commit	2025-11-06 16:00:38 +01:00
Adrian A. Baumann	fb05b74350	Pre-merge commit	2025-11-06 15:57:29 +01:00
Adrian A. Baumann	27b0f62274	Readme added	2025-11-04 16:53:31 +01:00