solve merge confilcts

5221a372 · Govind Dixit · 9fd7e752 · 9fd7e752 · 9fd7e752
Commit 5221a372 authored Dec 29, 2018 by Govind Dixit
Expand all Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 695 deletions

strings.xml app/src/main/res/values-hi/strings.xml +0 -349

strings.xml app/src/main/res/values-ru/strings.xml +0 -346

No files found.
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml