Merged
Conversation
Collaborator
|
@minimusic looks like the commit where you actually changed the method name didn't make it into this PR! |
Contributor
Author
|
I see it there... do you see two files changed? Line 24 of |
Collaborator
|
I was just not looking in the right place. But also, it is weird to have it in one commit that just mentions the tests. I'd fix it with git commit --amend -m "Prefix extension method to avoid name collisions."
git push --force(Making sure you're on the right branch first!) |
0e42c51 to
70904e9
Compare
52208a5 to
9c67a50
Compare
9c67a50 to
07c3517
Compare
ZevEisenberg
approved these changes
Mar 6, 2019
…e-tint-naming' Conflicts: Pod/Classes/BetterButton/BetterButton.swift
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.
prefixed method; fixes #121