# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2016-12-30 09:42:54 +05:30
18 changed files with 731 additions and 6 deletions
+1 -1
View File
@@ -24,7 +24,7 @@
<string name="select_language">Please select language</string>
<string name="title_activity_select_language">SelectLanguageActivity</string>
<string name="title_activity_store_list_geotag">StoreListActivity</string>
<string name="title_activity_store_list_geotag">Store List</string>
<string name="menu_daily_route_plan">Daily Route Plan</string>