merge README

This commit is contained in:
Riviera Taylor
2025-02-19 14:20:59 +01:00

View File

@ -27,7 +27,11 @@ This is a composite Gitea Action (Linux runner) for deploying repository content
with:
fetch-depth: 0
- name: "Deploy"
<<<<<<< HEAD
uses: https://code.klank.school/riviera/actions-file-deployer@v3
=======
uses: https://code.klank.school/riviera/actions-file-deployer@v2
>>>>>>> c2546a80a3777e62d79d9e9b12c0d430b2ef3aa3
with:
remote-protocol: "sftp"
remote-host: "ftp.example.com"
@ -65,7 +69,11 @@ jobs:
with:
fetch-depth: 0
- name: "Deploy"
<<<<<<< HEAD
uses: https://code.klank.school/riviera/actions-file-deployer@v3
=======
uses: https://code.klank.school/riviera/actions-file-deployer@v2
>>>>>>> c2546a80a3777e62d79d9e9b12c0d430b2ef3aa3
with:
remote-protocol: "sftp"
remote-host: "ftp.example.com"