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
This commit is contained in:
@@ -80,7 +80,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD);
|
||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE);
|
||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU);
|
||||||
|
|
||||||
//Gagan End
|
//Gagan End
|
||||||
|
|
||||||
db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
|
db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING);
|
||||||
|
|||||||
Reference in New Issue
Block a user