From c64303611ec42b9c3939c69e842a07032ef5c314 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 30 Dec 2016 09:46:52 +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 --- .../com/gskmtorange/Database/GSKOrangeDB.java | 19 ------------------- 1 file changed, 19 deletions(-) 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 a58959e..1d598ed 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -47,7 +47,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } public void deleteTableWithStoreID(String storeid, String process_id) { - } public void deleteAllTables() { @@ -102,15 +101,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - - - - - - - - - public ArrayList getStoreData(String date) { @@ -189,13 +179,4 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - - - - - - - - - }