Merge conflicts #384
Closed
Merge conflicts #384
Conversation
This file contains 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
* Better formatting for bigger numbers * Formating formatters file * Removing mime requirement. Not needed.
* Enter button submits forms, simple solution * Code style fixes
* Don't run coveralls on local * Cleaner solution for: Don't run coveralls on local * Use new test-ci command for ci
* Configurable currencies * Missed settings in the merge resolution commit * Fix lint issue
…tyOfZion#376) * CityOfZion#336 * Allow for 'paste' only
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.
What current issue(s) from Trello/Github does this address?
What problem does this PR solve?
How did you solve this problem?
How did you make sure your solution works?
Are there any special changes in the code that we should be aware of?
Is there anything else we should know?