This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Fix merge conflicts for @kvarel#4678
Merged
jasonsanjose merged 2 commits intomasterfrom Aug 6, 2013
Merged
Conversation
…l-4607 Conflicts: src/nls/cs/strings.js
Member
Author
|
Merging |
jasonsanjose
added a commit
that referenced
this pull request
Aug 6, 2013
Fix merge conflicts for @kvarel
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.
1 participant
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.
Fixing merge conflicts in #4607 for @kvarel