Skip to content

Commit 0196335

Browse files
authored
Merge branch 'gurumnyang:master' into master
2 parents fc1298f + b7630f9 commit 0196335

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Deploy to Server
44
on:
55
push:
66
branches:
7-
- main
7+
- master
88

99
jobs:
1010
deploy:
@@ -23,7 +23,7 @@ jobs:
2323
username: ${{ secrets.SERVER_USER }}
2424
key: ${{ secrets.SERVER_SSH_KEY }}
2525
script: |
26-
cd /ArWebAuth/
27-
git pull origin main
26+
cd ./ArWebAuth/
27+
git pull origin master
2828
npm install
2929
pm2 restart www

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,10 @@ API는 아직 지원되지 않습니다.
5656
기여
5757

5858
If you'd like to contribute to this project, feel free to open a pull request. Please ensure that your changes are thoroughly tested and documented.
59-
이 프로젝트에 기여하고 싶다면 자유롭게 풀 리퀘스트를 열어주세요. 변경 사항이 철저히 테스트되고 문서화되었는지 확인해 주세요.
59+
이 프로젝트에 기여하고 싶다면 자유롭게 풀 리퀘스트를 열어주세요. 변경 사항이 철저히 테스트되고 문서화되었는지 확인해 주세요.
60+
61+
62+
63+
64+
65+

views/home.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<div class="container-fluid">
125125
<a class="navbar-brand" href="#">
126126
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="32" class="me-2 ar-logo" viewBox="0 0 118 94" role="img"><title>[서비스명]</title></svg>
127-
<span>아름스템프</span></a>
127+
<span>아름스탬프</span></a>
128128
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
129129
<span class="navbar-toggler-icon"></span>
130130
</button>

0 commit comments

Comments
 (0)