fix: remove leftovers from interactive rebase
All checks were successful
/ validate (pull_request) Successful in 3m18s
All checks were successful
/ validate (pull_request) Successful in 3m18s
This commit is contained in:
parent
ab8150ccc6
commit
2b73095c62
1 changed files with 0 additions and 4 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue