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 new Canon model IDs (backport #3035) #3037

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2024


This is an automatic backport of pull request #3035 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 2, 2024
Copy link
Contributor Author

mergify bot commented Sep 2, 2024

Cherry-pick of 44bc543 has failed:

On branch mergify/bp/0.28.x/pr-3035
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 44bc5436a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/canonmn_int.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot mentioned this pull request Sep 2, 2024
(cherry picked from commit 44bc543)

# Conflicts:
#	src/canonmn_int.cpp
@kmilos kmilos added makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Sep 2, 2024
@kmilos kmilos added this to the v0.28.4 milestone Sep 2, 2024
@kmilos kmilos merged commit 9c09f43 into 0.28.x Sep 2, 2024
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3035 branch September 2, 2024 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant