Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user