merge conflict

cuappdev · Nov 7, 2024 · 9f2e458 · 9f2e458
2 parents 30737aa + 9b290a3
commit 9f2e458
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties