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
This commit is contained in:
@@ -265,7 +265,7 @@ public class MainActivity extends AppCompatActivity
|
|||||||
|
|
||||||
} else if (id == R.id.nav_setting) {
|
} else if (id == R.id.nav_setting) {
|
||||||
|
|
||||||
startActivity(new Intent(MainActivity.this, CategoryListActivity.class));
|
//startActivity(new Intent(MainActivity.this, CategoryListActivity.class));
|
||||||
|
|
||||||
} else if (id == R.id.nav_export) {
|
} else if (id == R.id.nav_export) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user