Solve merge conflict

ConductionNL · Oct 22, 2024 · e7f3a39 · e7f3a39
1 parent b74e91c
commit e7f3a39
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
diff --git a/composer.json b/composer.json