This repository was archived by the owner on Nov 2, 2022. It is now read-only.
Open
Conversation
fce8938 to
d3a5ad4
Compare
Contributor
|
Thanks! |
04a5620 to
8c312b7
Compare
Author
|
I don't get what the problem, I removed these files and there should be any conflicts. When I rebase onto master, it's is up to date 🤔 |
Contributor
|
Maybe you tried merging your repo's master instead of PushFish:master? |
Contributor
|
Thanks, @antercepter for your submission submissions solving these issues are really helping get us past any of the excuses we might have for taking our time! Very powerful stuff, can't wait for the merge to be accepted. |
added 2 commits
October 26, 2018 10:32
8c312b7 to
760e319
Compare
Author
|
Conflicts were fixed, force pushed |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.