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

Remove merge marker in recipes.md #782

Merged
merged 1 commit into from Jan 4, 2020
Merged

Remove merge marker in recipes.md #782

merged 1 commit into from Jan 4, 2020

Conversation

markphelps
Copy link

Remove <<<<<<< HEAD marker in recipes.md

Checklist

  • The code change is tested and works locally.
  • Tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?

@markphelps
Remove merge marker in recipes.md
6d8b5a5 
Remove <<<<<<< HEAD marker in recipes.md
@wren wren changed the base branch from master to develop January 4, 2020 20:39
wren
wren approved these changes Jan 4, 2020
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 a5d2e16 into jrnl-org:develop Jan 4, 2020
@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
@markphelps markphelps deleted the patch-1 branch May 21, 2020 14:11
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.

None yet
2 participants
@markphelps @wren