fix conflicts

This commit is contained in:
2024-03-05 12:04:48 +02:00
405 changed files with 9302 additions and 1924 deletions

1
.gitignore vendored
View File

@@ -17,7 +17,6 @@ publishtools/publishtools
.cache
.DS_Store
src/.temp
content/news
content/person
content/project
node_modules