From 4bc139fef9dc6f68b0f95fc77425491f0001df42 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 26 May 2017 19:09:57 -0300 Subject: [PATCH] Fixed conflicts --- .../importers/class-wc-product-csv-importer-controller.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/includes/admin/importers/class-wc-product-csv-importer-controller.php b/includes/admin/importers/class-wc-product-csv-importer-controller.php index 665ba3171d3..1b90fd7b805 100644 --- a/includes/admin/importers/class-wc-product-csv-importer-controller.php +++ b/includes/admin/importers/class-wc-product-csv-importer-controller.php @@ -534,13 +534,10 @@ class WC_Product_CSV_Importer_Controller { 'stock_quantity' => __( 'Stock', 'woocommerce' ), 'category_ids' => __( 'Categories', 'woocommerce' ), 'tag_ids' => __( 'Tags', 'woocommerce' ), -<<<<<<< HEAD 'shipping_class_id' => __( 'Shipping Class', 'woocommerce' ), 'images' => __( 'Images', 'woocommerce' ), -======= 'shipping_class_id' => __( 'Shipping class', 'woocommerce' ), - 'image_id' => __( 'Images', 'woocommerce' ), ->>>>>>> feature/product-csv-import-export + 'images' => __( 'Images', 'woocommerce' ), 'parent_id' => __( 'Parent', 'woocommerce' ), 'upsell_ids' => __( 'Upsells', 'woocommerce' ), 'cross_sell_ids' => __( 'Cross-sells', 'woocommerce' ),