# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-09 18:11:20 +05:30
parent 362f3ed0a3
commit 5d6f153018
4 changed files with 206 additions and 144 deletions
@@ -101,9 +101,6 @@
<string name="title_store_list_download_data">Please Download Data First</string>
<string name="enter_the_values">Enter the values</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="title_activity_upload">Upload Data</string>
<string name="no_data_for_upload">No Data For Upload</string>
<string name="first_checkout_store">First checkout of store</string>