#1623 [ODT] fix: rebase conflict template

Evarisk · Jan 13, 2024 · e15ed83 · e15ed83
1 parent 1062737
commit e15ed83
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/documents/doctemplates/controldocument/template_controldocument.odt b/documents/doctemplates/controldocument/template_controldocument.odt
diff --git a/documents/doctemplates/controldocument/template_controldocument_photo.odt b/documents/doctemplates/controldocument/template_controldocument_photo.odt