Paul De Geest

> Unresolved conflicts have been pushed to the branch I've reverted the branch.

Two small issues I found: For the connecting to a cluster training: https://github.com/galaxyproject/training-material/blob/e822f5fe70007fb085e8f1382833c79ea02d14a1/topics/admin/tutorials/connect-to-compute-cluster/tutorial.md?plain=1#L165 `cons_res` is legacy and is replaced by `cons_tres` For the TPV training: https://github.com/galaxyproject/training-material/blob/e822f5fe70007fb085e8f1382833c79ea02d14a1/topics/admin/tutorials/job-destinations/tutorial.md?plain=1#L732 `params['walltime']` should be `entity.params.get('walltime')`...

Here's the PR https://github.com/galaxyproject/training-material/pull/6502