Merge branch 'test-woodpecker'

2024-06-20 06:30:32 +03:00 · 2024-06-20 06:30:32 +03:00 · d7b839f197
commit d7b839f197
parent b2e1677b9a
1 changed files with 0 additions and 6 deletions
--- a/.woodpecker/.make-app.yaml
+++ b/.woodpecker/.make-app.yaml
@ -43,15 +43,9 @@ steps:
      password:
        from_secret: gitea_passwd
      debug: "true"
-<<<<<<< HEAD
-      owner: "plugins"
-      package_name: "dummy_package"
-      package_version: ${CI_COMMIT_TAG}
-=======
      owner: "iHackFX"
      package_name: "library"
      package_version: "0.1.0"
->>>>>>> test-woodpecker
      file_source: "./android/app/build/outputs/apk/debug/app-debug.apk"
      file_name: "app-debug.apk"
      update: "true"