Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ROSCon Spain 2023 ros2_control talk to resources (backport #337) #339

Merged
merged 3 commits into from
Aug 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2024

This PR adds reference to my last year talk on introduction to ros2_control at ROSCon Spain 2023


This is an automatic backport of pull request #337 done by Mergify.

(cherry picked from commit a340cc8)

# Conflicts:
#	doc/resources/resources.rst
@mergify mergify bot added the conflicts label Aug 30, 2024
Copy link
Contributor Author

mergify bot commented Aug 30, 2024

Cherry-pick of a340cc8 has failed:

On branch mergify/bp/iron/pr-337
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit a340cc8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   doc/resources/presentations/ROSCon_Spain_2023_introduction_to_ros2_control.pdf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/resources/resources.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@bmagyar bmagyar merged commit 10b5d09 into iron Aug 30, 2024
3 of 4 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-337 branch August 30, 2024 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants