From 25008a1aef67f2acfa6d8e3b93f1f1b45759f753 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 5 Jan 2017 15:26:15 +0530
Subject: [PATCH] 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
---
 GSKMTOrange/src/main/res/values/strings.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 22bafb8..4211cc7 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -52,9 +52,11 @@
     <string name="menu_setting">Setting</string>
     <string name="menu_services">Services</string>
 
-    <string name="title_activity_category_list">Category List</string>
     <string name="title_activity_t2_pcompliance">T2P Compliance</string>
 
+    <!--Gagan start code-->
+
+    <string name="title_activity_category_list">Category List</string>
     <string name="title_activity_category_wise_performance">Categorywise Performance</string>
     <string name="title_activity_daily_main_menu">Daily Data Menu</string>
     <string name="title_activity_msl__availability">Must Stock Availability</string>
@@ -78,25 +80,19 @@
     <string name="stock_facing_faceup">Facing</string>
     <string name="stock_facing_sos_target">SOS Target</string>
 
+    <!--Gagan end code-->
 
     <string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
     <string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
     <string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
 
-
-
     <string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
     <string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
     <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_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>
 
-
-
 </resources>