Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
@@ -56,8 +56,9 @@
|
||||
<string name="msl_availability_availability">Availability</string>
|
||||
|
||||
<string name="stock_facing_reference_image">Reference Image</string>
|
||||
<string name="stock_facing_sku_name">SKU Name</string>
|
||||
<string name="stock_facing_stock">Stock</string>
|
||||
<string name="stock_facing_facing">Facing</string>
|
||||
<string name="stock_facing_faceup">Facing</string>
|
||||
<string name="stock_facing_sos_target">SOS Target</string>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user