Skip to content

Template string indentation #370

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
Merged
merged 1 commit into from
Apr 22, 2016
Merged

Template string indentation #370

merged 1 commit into from
Apr 22, 2016

Conversation

bounceme
Copy link
Collaborator

as per #314

@amadeus
Copy link
Collaborator

amadeus commented Apr 20, 2016

Can you rebase develop into this so we can get it merged in?

@bounceme bounceme force-pushed the patch-6 branch 2 times, most recently from 3f06a2c to 3743931 Compare April 20, 2016 23:42
@bounceme
Copy link
Collaborator Author

Is this better? It says there aren't any conflicts

@amadeus amadeus merged commit 20b0eb6 into pangloss:develop Apr 22, 2016
@amadeus
Copy link
Collaborator

amadeus commented Apr 22, 2016

Looks good, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bounceme @amadeus