Fixed Merge conflict

This commit is contained in:
tanvidadu 2018-03-11 19:34:46 +05:30
parent 757a198c99
commit a6a30e1e77
2 changed files with 2 additions and 0 deletions

View file

@ -245,5 +245,6 @@
<string name="about_rate_us"><u>Rate Us</u></string>
<string name="about_faq">Frequently Asked Questions</string>
<string name="welcome_skip_button">Skip Tutorial</string>
<string name="about_translate"><u>Translate</u></string>
</resources>