From efaea20e0da369a8db44b78338f460d0ba5dcfd2 Mon Sep 17 00:00:00 2001 From: WBHarry Date: Tue, 15 Jul 2025 18:09:59 +0200 Subject: [PATCH] Merge fix --- .github/workflows/deploy.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 41aec172..2c6ec7e9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,11 +37,7 @@ jobs: download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip # Create a zip file with all files required by the module to add to the release -<<<<<<< Updated upstream - - run: zip -r ./system.zip system.json README.md LICENSE build/daggerheart.js assets/ templates/ styles/daggerheart.css styles/tagify.css packs/ lang/ -======= - - run: zip -r ./system.zip system.json README.md LICENSE build/daggerheart.js build/daggerheart.css build/tagify.css assets/ templates/ packs/ lang/ ->>>>>>> Stashed changes + - run: zip -r ./system.zip system.json README.md LICENSE build/daggerheart.js build/tagify.css styles/daggerheart.css assets/ templates/ packs/ lang/ # Create a release for this specific version - name: Update Release with Files