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

macros: fix references to Error in docstrings #87

Merged
merged 1 commit into from
Nov 22, 2023

Conversation

birkenfeld
Copy link
Contributor

No description provided.

@birkenfeld
Copy link
Contributor Author

birkenfeld commented Dec 3, 2022

Fixes #53 and now #54

Copy link
Contributor

@thenorili thenorili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks for correcting the mistaken documentation :)

Copy link
Contributor

@thenorili thenorili left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer if these two changes were squashed seeing as half of the first commit is overwritten by the second.

@thenorili thenorili enabled auto-merge (squash) November 22, 2023 05:19
@thenorili thenorili enabled auto-merge (squash) November 22, 2023 05:59
@thenorili thenorili enabled auto-merge (rebase) November 22, 2023 06:00
@thenorili thenorili enabled auto-merge (squash) November 22, 2023 06:01
@thenorili
Copy link
Contributor

It says macros.rs has merge conflicts. I pulled it locally and don't see any, but there's nothing I can do from here. @birkenfeld will have to squash and rebase on their end. Sorry if you got spammed with my auto-merge stuff while I was trying to figure things out. This is ready to go when the conflicts are resolved.

auto-merge was automatically disabled November 22, 2023 06:41

Head branch was pushed to by a user without write access

@thenorili thenorili merged commit ef77800 into eyre-rs:master Nov 22, 2023
29 checks passed
@birkenfeld birkenfeld deleted the patch-1 branch November 22, 2023 06:46
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.

None yet

2 participants