# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2017-01-06 17:52:25 +05:30
parent 6b08d54536
commit 04875b6fc8
29 changed files with 1419 additions and 54 deletions
@@ -94,5 +94,6 @@
<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>
<string name="title_activity_promo_compliance">PromoCompliance</string>
</resources>