# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2017-01-05 15:14:06 +05:30
parent 309bce327a
commit 54072e8e94
7 changed files with 273 additions and 267 deletions
+1 -1
View File
@@ -92,7 +92,7 @@
<string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="save">SAVE</string>
<string name="title_store_list_checkout_current">Please checkout from current store</string>
<string name="title_store_list_checkout_Already_filled">Data already filled</string>