Readme added

2025-11-04 16:53:31 +01:00
2 changed files with 10 additions and 0 deletions
--- 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)
--- 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)