Compare commits

..

No commits in common. "f0a1ca5445e0cce6dfd7241cfea2bc19525f076a" and "8353299737d31b7406d6587e8e5095d6745ed6a5" have entirely different histories.

View file

@ -14,7 +14,11 @@ 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