Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

master #368

Merged
merged 3 commits into from
Jan 20, 2020
Merged

master #368

merged 3 commits into from
Jan 20, 2020

Conversation

kaustubhk24
Copy link
Contributor

No description provided.

@hbb20
Copy link
Owner

hbb20 commented Jan 20, 2020

Hey @kaustubhk24 thanks for the PR. I have resolved the conflict. It seems like new file marathi.xml is in your local machine. Since it was a new file, it was not tracked by git and is not included in the commit. So https://github.com/hbb20/CountryCodePickerProject/pull/368/files does not show the file.

This is what you will need to do:

  1. Pull your master to get conflict resolved code in your local machine Video
  2. Track (using git add command) and commit marathi.xml file. Video
  3. Push the code (it will automatically update this PR)

@kaustubhk24
Copy link
Contributor Author

Please check

@hbb20 hbb20 merged commit 11372f4 into hbb20:master Jan 20, 2020
@hbb20
Copy link
Owner

hbb20 commented Jan 20, 2020

Thank you for your support. v2.3.6 is released and has Marathi language support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hbb20 hbb20 hbb20 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kaustubhk24 @hbb20