Add set num to tokens.xml (Cleaner PR)#355
Open
SlightlyCircuitous wants to merge 1 commit intoCockatrice:masterfrom
Open
Add set num to tokens.xml (Cleaner PR)#355SlightlyCircuitous wants to merge 1 commit intoCockatrice:masterfrom
SlightlyCircuitous wants to merge 1 commit intoCockatrice:masterfrom
Conversation
Member
|
I don't fully understand why you made a new pr, making a separate page for it makes it harder to track the conversation on it, actually adding more complexity? |
Contributor
Author
|
Github said something about the merge being too complicated to resolve: I got worried I made a mess of things. I still have that branch though; I can reopen the other PR. |
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.
Clean PR in favor of #350, which seems like it was getting a little complicated with the updates I made.