Merge remote-tracking branch 'origin/GeoT' into GeoT

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-06 11:42:14 +05:30
parent 852c6f61e5
commit 83e6be733b
22 changed files with 1137 additions and 267 deletions
+2 -1
View File
@@ -90,13 +90,14 @@
<string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="title_store_list_activity_already_store_closed">Store Already 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>
<string name="title_store_list_download_data">Please Download Data First</string>
</resources>