diff --git a/includes/admin/settings/class-wc-settings-products.php b/includes/admin/settings/class-wc-settings-products.php index 58790b654fd..48b2b796a9d 100644 --- a/includes/admin/settings/class-wc-settings-products.php +++ b/includes/admin/settings/class-wc-settings-products.php @@ -56,54 +56,6 @@ class WC_Settings_Products extends WC_Settings_Page { } /** -<<<<<<< HEAD -======= - * Show a notice showing where some options have moved. - * - * @since 3.3.0 - * @todo remove in next major release. - */ - private function product_display_settings_moved_notice() { - if ( get_user_meta( get_current_user_id(), 'dismissed_product_display_settings_moved_notice', true ) ) { - return; - } - ?> -
- >>>>>> master * Save settings. */ public function save() { @@ -128,10 +80,6 @@ class WC_Settings_Products extends WC_Settings_Page { $settings = apply_filters( 'woocommerce_inventory_settings', array( -<<<<<<< HEAD - -======= ->>>>>>> master array( 'title' => __( 'Inventory', 'woocommerce' ), 'type' => 'title',