jad0s/gitops
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: remove leftovers from interactive rebase #3

Merged
jad0s merged 2 commits from dev into main 2026-06-12 20:30:06 +00:00
Conversation 0 Commits 2 Files changed 1 -4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2b73095c62 - Show all commits

4
manifests/forgejo/runner.yaml
View file

@ -14,11 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: runner - name: runner
<<<<<<< HEAD
image: forgejo.libretalk.eu/jad0s/forgejo-runner:latest image: forgejo.libretalk.eu/jad0s/forgejo-runner:latest
=======
image: code.forgejo.org/forgejo/runner:3.5.1
>>>>>>> e1bf8ad (fix(forgejo): remove extra indentation)
command: command:
- sh - sh
- -c - -c