fix/머지 충돌 해결

yelynnn · Feb 2, 2025 · 591d491 · 591d491
1 parent 7fe9bca
commit 591d491
Show file tree

Hide file tree

Showing 4 changed files with 341 additions and 1,112 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,7 +3,6 @@ name: Deploy
 on:
   push:
     branches:
-      - main
       - develop
 
 jobs:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ name: Deploy @@
     on:
       push:
         branches:
-          - main
           - develop
     jobs:
@@ Expand Down @@