From 5d2372b6513c6a6dceff63f2ffa43d8380d7381b Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Fri, 30 Dec 2016 09:43:38 +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
---
 .../src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
index 5225e7d..a58959e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
-import cpm.com.gskmtorange.xmlHandlers.TableBean;
+import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
 
 /**
  * Created by ashishc on 29-12-2016.