From ddc6b0d4a974d5f65fc007da7569c92664728dcb Mon Sep 17 00:00:00 2001 From: Talupula Sahithi Date: Mon, 7 Oct 2024 17:20:23 +0530 Subject: [PATCH] Resolved merge conflict in application.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index eef557c..53718a7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,2 @@ spring.application.name=libraryman-api -spring.profiles.active=${ENV:development} +spring.profiles.active=${ENV:development} \ No newline at end of file