Merging release_config.json with config.json#562
Closed
elicwhite wants to merge 1 commit intoPokemonGoF:devfrom
elicwhite:merge-config
Closed
Merging release_config.json with config.json#562elicwhite wants to merge 1 commit intoPokemonGoF:devfrom elicwhite:merge-config
elicwhite wants to merge 1 commit intoPokemonGoF:devfrom
elicwhite:merge-config
Conversation
Contributor
|
This branch has conflicts that must be resolved |
Contributor
|
cleaning up the pull-request folder, please reopen when you done the rebase. |
Contributor
Author
|
Reopened here: #568 |
hoanghuynh
pushed a commit
to hoanghuynh/PokemonGo-Bot
that referenced
this pull request
Sep 28, 2016
* Removed ignore and only from global config, cleaned up * Reintroduced support for additional Flask init kwargs
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
2 participants
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.
Short Description: Instead of having two required configuration files, we are merging them together.