fix confflict
This commit is contained in:
commit
9525e30b97
4
.github/workflows/tf_update.yml
vendored
4
.github/workflows/tf_update.yml
vendored
@ -1,7 +1,7 @@
|
||||
name: ourverse.tf
|
||||
on:
|
||||
push:
|
||||
branch: [development]
|
||||
branch: [master]
|
||||
|
||||
jobs:
|
||||
job_one:
|
||||
@ -18,6 +18,6 @@ jobs:
|
||||
script: |
|
||||
cd /home/webuser/websites/www_ourverse
|
||||
git log -1
|
||||
git restore static/css/index.css
|
||||
git restore .
|
||||
git pull
|
||||
bash build.sh
|
||||
|
Loading…
Reference in New Issue
Block a user