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

Remove using std::map from header #3287

Merged
merged 2 commits into from
Aug 4, 2021

Conversation

kenballus
Copy link
Contributor

Remove the last using std::something from a header file, as requested in #2354.

@LittleHuba
Copy link
Member

Just as a side-note: Please never merge master into your PR-branch. Instead, rebase your branch on top of master.
This is because, in a merge, you must potentially edit code from others. This may lead to you accidentally introducing a bug into the work of somebody else. If you perform a rebase instead, you only edit your own work, which we will look over before merging.

In this instance all is good and you can leave it as it is. We will squash the commits and you only changed the one thing you wanted to change.

@LittleHuba
Copy link
Member

LGTM merge in 24 hours.

@Febbe Febbe changed the title Remove using std::map from header Remove using std::map from header Aug 4, 2021
@LittleHuba LittleHuba merged commit c420c53 into xournalpp:master Aug 4, 2021
@kenballus kenballus deleted the remove-using-from-header branch August 24, 2021 12:13
jetSett pushed a commit to jetSett/xournalpp that referenced this pull request Oct 5, 2021
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

3 participants