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.

Sign up for GitHub

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

Jump to bottom

Fix merge conflict left-over #767

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Fix merge conflict left-over #767

merged 1 commit into from
Dec 3, 2019

Conversation

thejspr
Copy link
Contributor

@thejspr thejspr commented Dec 3, 2019

Small update to the docs removing a left-over merge conflict.

@wren wren changed the base branch from master to develop December 3, 2019 16:10
wren
wren approved these changes Dec 3, 2019
View reviewed changes
Copy link
Member

@wren wren left a comment

Choose a reason for hiding this comment

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

Thank you!

@wren wren merged commit a1d3577 into jrnl-org:develop Dec 3, 2019
@thejspr thejspr deleted the patch-1 branch December 3, 2019 18:13
@wren wren added the documentation Improvements or additions to documentation label Jan 10, 2020
@lock
Copy link

lock bot commented May 21, 2020

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot added the 🔒 Outdated label May 21, 2020
@lock lock bot locked as resolved and limited conversation to collaborators May 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wren wren wren approved these changes

Assignees
No one assigned
Labels
documentation Improvements or additions to documentation 🔒 Outdated
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thejspr @wren