From c9a7aeed862f9b434c23018ab076a21d7a7d5158 Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Mon, 9 Jan 2017 18:13:14 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 GG_Update_Manifest

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
---
 .../main/java/cpm/com/gskmtorange/upload/UploadActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index c29de18..49e3763 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -245,7 +245,7 @@ public class UploadActivity extends AppCompatActivity {
                             //Stock and Facing
 
 
-                            
+
 
                             // SET COVERAGE STATUS
                             String final_xml = "";