[MERGE] 병합 충돌 오류 해결 #117

Team-Umbba · Feb 10, 2024 · 932178d · 932178d
1 parent c46bf1a
commit 932178d
Show file tree

Hide file tree

Showing 20 changed files with 108 additions and 648 deletions.
diff --git a/.github/workflows/api-CD.yml b/.github/workflows/api-CD.yml
diff --git a/.github/workflows/api-CI.yml b/.github/workflows/api-CI.yml
diff --git a/.github/workflows/notification-CD.yml b/.github/workflows/notification-CD.yml
diff --git a/.github/workflows/notification-CI.yml b/.github/workflows/notification-CI.yml
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+umbba-test.http
+
 ## Querydsl
 umbba-domain/src/main/generated
 

diff --git a/scripts/umbba-api/appspec.yml b/scripts/umbba-api/appspec.yml