From e1edc5c8bc96445e3fa3790d2da048d03462b347 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 6 Jan 2017 17:53:28 +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 | 1 - 1 file changed, 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 e403442..b85c7f0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -82,7 +82,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Gagan End - db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING); db.execSQL(CommonString.CREATE_TABLE_COVERAGE_DATA);