Fixing bad merge

rramo012 · rramo012 · commit f09794b5068c · 2016-04-12T10:09:46.000-04:00
diff --git a/boldgrid-theme-framework/includes/class-boldgrid-framework.php b/boldgrid-theme-framework/includes/class-boldgrid-framework.php
@@ -354,7 +354,6 @@ private function define_admin_hooks() {
 		if ( ! $this->doing_cron ) {
 			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'do_activate' );
 			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'transfer_menus', 10, 2 );
-			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'disable_advanced_nav_options' );
 		}
 
 		$this->loader->add_action( 'mce_external_plugins', $boldgrid_framework_editor, 'add_tinymce_plugin' );
diff --git a/src/includes/class-boldgrid-framework.php b/src/includes/class-boldgrid-framework.php
@@ -354,7 +354,6 @@ private function define_admin_hooks() {
 		if ( ! $this->doing_cron ) {
 			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'do_activate' );
 			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'transfer_menus', 10, 2 );
-			$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'disable_advanced_nav_options' );
 		}
 
 		$this->loader->add_action( 'mce_external_plugins', $boldgrid_framework_editor, 'add_tinymce_plugin' );

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ private function define_admin_hooks() {`
`354`	`354`	`if ( ! $this->doing_cron ) {`
`355`	`355`	`$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'do_activate' );`
`356`	`356`	`$this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'transfer_menus', 10, 2 );`
`357`		`- $this->loader->add_action( 'after_switch_theme', $boldgrid_framework_activate, 'disable_advanced_nav_options' );`
`358`	`357`	`}`
`359`	`358`
`360`	`359`	`$this->loader->add_action( 'mce_external_plugins', $boldgrid_framework_editor, 'add_tinymce_plugin' );`