manifests/forgejo/runner.yaml

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