From e1e13dee91c8258ccd712ecdbdf6c643d94533a6 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Thu, 18 Apr 2019 12:06:13 +0100
Subject: [PATCH] merge conflict

---
 .../settings/class-wc-settings-products.php   | 52 -------------------
 1 file changed, 52 deletions(-)

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;
-		}
-		?>
-		<div id="message" class="updated woocommerce-message inline">
-			<a class="woocommerce-message-close notice-dismiss" style="top:0;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'product_display_settings_moved' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce' ); ?></a>
-
-			<p>
-				<?php
-				echo wp_kses(
-					sprintf(
-						/* translators: %s: URL to customizer. */
-						__( 'Looking for the product display options? They can now be found in the Customizer. <a href="%s">Go see them in action here.</a>', 'woocommerce' ),
-						esc_url(
-							add_query_arg(
-								array(
-									'autofocus' => array(
-										'panel' => 'woocommerce',
-									),
-									'url'       => wc_get_page_permalink( 'shop' ),
-								),
-								admin_url( 'customize.php' )
-							)
-						)
-					),
-					array(
-						'a' => array(
-							'href'  => array(),
-							'title' => array(),
-						),
-					)
-				);
-				?>
-			</p>
-		</div>
-		<?php
-	}
-
-	/**
->>>>>>> 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',