Wwhat about now?

2025-01-04 16:23:13 +03:30
parent 4fc971d1b4 fdc5ee9728
commit 10323af4a4
1 changed files with 4 additions and 0 deletions
--- a/.gitea/workflows/gitea-ci.yml
+++ b/.gitea/workflows/gitea-ci.yml
@@ -44,7 +44,11 @@ jobs:
        with:
          context: .
          push: true
+<<<<<<< HEAD
          tags: "git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot${{gitea.sha}},git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot:latest"
+=======
+          tags: tags: "git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot${{gitea.sha}},git.mahdium.ir/mahdium/cats-of-mastodon-telegram-bot:latest"
+>>>>>>> fdc5ee9728343b2a78ae9a0275c53824d9336f91
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=registry,ref=user/app:latest
          cache-to: type=inline