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

Failed to merge correctly in generator #7

Closed
ioquatix opened this issue Jul 7, 2017 · 1 comment
Closed

Failed to merge correctly in generator #7

ioquatix opened this issue Jul 7, 2017 · 1 comment

Comments

@ioquatix
Copy link
Collaborator

ioquatix commented Jul 7, 2017

Changing the Generate/Travis test target name caused the merge to drop the last line.
ioquatix added a commit to ioquatix/build-text that referenced this issue Jul 7, 2017
@ioquatix
Fix merging last lines. kurocha/teapot#7
15c89f9
@ioquatix
Copy link
Collaborator Author

ioquatix commented Jul 7, 2017

This is now fixed.

@ioquatix ioquatix closed this as completed Jul 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@ioquatix