Fix #1216 from previous PR #1217 - #1293
Merged
Merged
Conversation
This reverts commit f5e7756.
Conflicts: src/js/util.js
|
Changes Unknown when pulling a6c5c71 on integration-1216 into ** on master**. |
j0k3r
approved these changes
Feb 8, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
From @annayafi in #1216:
This PR wraps up #1216 by fixing some spacing issues and resolving a bug in the code. Thanks again @annayafi for opening the issue and fixing it! (Sorry for the massive delay in getting your fix merged!)