feat: settle version

devforth · Jan 29, 2025 · 1f6cdf9 · 1f6cdf9
1 parent 4e64dee
commit 1f6cdf9
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
@@ -23,13 +23,8 @@ steps:
     when:
       - event: push
     commands:
-<<<<<<< HEAD
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
-=======
       - apt update && apt install -y rsync
       - export $(cat /woodpecker/deploy.vault.env | xargs)
-      - cat /woodpecker/deploy.vault.env
->>>>>>> origin
       - npm clean-install
       - /bin/bash ./.woodpecker/buildRelease.sh
       - npm audit signatures