Continuing #42#47
Closed
CodeWithShreyans wants to merge 20 commits intotaganaka:masterfrom
CodeWithShreyans:master
Closed
Continuing #42#47CodeWithShreyans wants to merge 20 commits intotaganaka:masterfrom CodeWithShreyans:master
CodeWithShreyans wants to merge 20 commits intotaganaka:masterfrom
CodeWithShreyans:master
Conversation
Merge changes from JMacalinao
Add CURLOPT_ACCEPT_ENCODING option to fix errors downloading server list
Author
|
I did a rebase in GitKraken and it said Rebase Successfull. Don't know if it actually worked |
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.
I noticed that #42 creator was not responding so I tried my best to continue it. I'm not really a git pro so just check if everything's ok. Rebasing was giving this error: