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

[basic.type.qualifier] Clarify the definitions of const/volatile object #2323

Merged
merged 1 commit into from Nov 26, 2018

Conversation

jensmaurer
Copy link
Member

Partially addresses #2310.

source/basic.tex Outdated Show resolved Hide resolved
@zygoloid zygoloid added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Oct 9, 2018
@zygoloid
Copy link
Member

zygoloid commented Oct 9, 2018

Rebasing in the github UI failed somehow, can you rebase manually?

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Oct 9, 2018
@jensmaurer
Copy link
Member Author

jensmaurer commented Oct 9, 2018

Rebased, but I don't know why we now claim to have conflicts with the editor's report.

Edit: Ah, some force-push on the "master". Trying "git reset --hard" to counter, then force-push here. Success.

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