feat: merged version of PR #32, #34, and #35#36
Open
azaslavsky wants to merge 24 commits intochrisbateman:masterfrom
Open
feat: merged version of PR #32, #34, and #35#36azaslavsky wants to merge 24 commits intochrisbateman:masterfrom
azaslavsky wants to merge 24 commits intochrisbateman:masterfrom
Conversation
added 24 commits
August 30, 2017 14:52
…the x or y axis from scrolling
# Conflicts: # dist/impetus.js # dist/impetus.min.js # docs/impetus.min.js # src/Impetus.js
# Conflicts: # src/Impetus.js
# Conflicts: # src/Impetus.js
# Conflicts: # src/Impetus.js
# Conflicts: # README.md
# Conflicts: # README.md
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
1 participant
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.
PR's #32, #34, and #35 produce a lot of merge conflicts when pulled into
master(mainly in the documentation). This commit has resolved all of those conflicts, and can be accepted in lieu of the others if all three are deemed acceptable.