Merge branch 'dev_backend' of https://github.com/woowacourse-teams/20…

…23-naaga into feat/#303 � Conflicts: � .github/workflows/backend_dev_merge_workflow.yml
woowacourse-teams · Oct 2, 2023 · b1dcaf5 · b1dcaf5
2 parents 71f7ee6 + b09441e
commit b1dcaf5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/backend_dev_merge_workflow.yml b/.github/workflows/backend_dev_merge_workflow.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - dev_backend
+
 jobs:
   deploy:
     runs-on: naaga

diff --git a/backend/src/main/resources/security b/backend/src/main/resources/security
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ on: @@
       push:
         branches:
           - dev_backend
     jobs:
       deploy:
         runs-on: naaga
@@ Expand Down @@