Fixes conflict in merge request #31 #33
Merged
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
* Added rules for english cleanup, remove extra vowels in specific words guramukh, gurabani, guradhev, gurasikh, manamukh * words that start with ooRa like updesh should be updesh not aupdesh
* Initial Commit * Add better support * register hindi in translit.js * Add some more fixes to hindi * rename to devnagri * updated to add all characters required Some still need devnagri equivalent * Update devnagri.js * Update devnagri.js * Update devnagri.js * Update tests * remove prettier * ignore broken tests
Pull Request Test Coverage Report for Build 123
💛 - Coveralls |
navdeepsinghkhalsa
approved these changes
Feb 5, 2019
navdeepsinghkhalsa
pushed a commit
that referenced
this pull request
Feb 5, 2019
* update readme with unique letters dumped from db * committing current work * first full ipa module * committing ipa updates * fixed a few letters and added regex fixes * updated * fix ʊ with common vowel * fix some vowel placement * o for hora * revert hora * eIAih = ɑɪæh * updated version, linted * fix failed tests * taksalify * Fixes conflict in merge request #31 (#33) * English updates (#30) * Added rules for english cleanup, remove extra vowels in specific words guramukh, gurabani, guradhev, gurasikh, manamukh * words that start with ooRa like updesh should be updesh not aupdesh * [WIP] Hindi Translit (#19) * Initial Commit * Add better support * register hindi in translit.js * Add some more fixes to hindi * rename to devnagri * updated to add all characters required Some still need devnagri equivalent * Update devnagri.js * Update devnagri.js * Update devnagri.js * Update tests * remove prettier * ignore broken tests * Update LICENSE.md (#32) * Update package.json * Adds more tests for translit function; corrects output in comments of code * Removes changes from .eslintignore and .gitignore
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.
This will fix the merge conflicts in
#31
Also, did the changes as per the review in above pr by @navdeepsinghkhalsa veerji!