Fixed merge conflicts

This commit is contained in:
EivindH06
2025-10-07 08:53:55 +02:00
3 changed files with 31 additions and 23 deletions

1
.gitignore vendored
View File

@@ -22,3 +22,4 @@ node_modules
localazy-keys.json
localazy/language
.env
/.env