Merge pull request 'fix: remove leftovers from interactive rebase' (#3 ) from dev into main

Reviewed-on: #3
Merge branch 'main' into dev
2026-06-12 20:30:05 +00:00 · 2026-06-12 20:07:14 +00:00 · 2026-06-12 22:06:25 +02:00
1 changed files with 0 additions and 4 deletions
--- a/manifests/forgejo/runner.yaml
+++ b/manifests/forgejo/runner.yaml
@ -14,11 +14,7 @@ spec:
    spec:
      containers:
      - name: runner
-<<<<<<< HEAD
        image: forgejo.libretalk.eu/jad0s/forgejo-runner:latest
-=======
-        image: code.forgejo.org/forgejo/runner:3.5.1
->>>>>>> e1bf8ad (fix(forgejo): remove extra indentation)
        command:
          - sh
          - -c
Author	SHA1	Message	Date
jad0s	f0a1ca5445	Merge pull request 'fix: remove leftovers from interactive rebase' (#3 ) from dev into main Reviewed-on: #3	2026-06-12 20:30:05 +00:00
jad0s	3321053167	Merge branch 'main' into dev All checks were successful / validate (pull_request) Successful in 17m51s Details	2026-06-12 20:07:14 +00:00
jad0s	2b73095c62	fix: remove leftovers from interactive rebase All checks were successful / validate (pull_request) Successful in 3m18s Details	2026-06-12 22:06:25 +02:00