Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts

This commit is contained in:
Claudio Sanches 2017-05-26 19:09:57 -03:00
parent 4d66bc9e45
commit 4bc139fef9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/admin/importers/class-wc-product-csv-importer-controller.php
View File

@ -534,13 +534,10 @@ class WC_Product_CSV_Importer_Controller {
'stock_quantity' => __( 'Stock', 'woocommerce' ), 'stock_quantity' => __( 'Stock', 'woocommerce' ),
'category_ids' => __( 'Categories', 'woocommerce' ), 'category_ids' => __( 'Categories', 'woocommerce' ),
'tag_ids' => __( 'Tags', 'woocommerce' ), 'tag_ids' => __( 'Tags', 'woocommerce' ),
<<<<<<< HEAD
'shipping_class_id' => __( 'Shipping Class', 'woocommerce' ), 'shipping_class_id' => __( 'Shipping Class', 'woocommerce' ),
'images' => __( 'Images', 'woocommerce' ), 'images' => __( 'Images', 'woocommerce' ),
=======
'shipping_class_id' => __( 'Shipping class', 'woocommerce' ), 'shipping_class_id' => __( 'Shipping class', 'woocommerce' ),
'image_id' => __( 'Images', 'woocommerce' ), 'images' => __( 'Images', 'woocommerce' ),
>>>>>>> feature/product-csv-import-export
'parent_id' => __( 'Parent', 'woocommerce' ), 'parent_id' => __( 'Parent', 'woocommerce' ),
'upsell_ids' => __( 'Upsells', 'woocommerce' ), 'upsell_ids' => __( 'Upsells', 'woocommerce' ),
'cross_sell_ids' => __( 'Cross-sells', 'woocommerce' ), 'cross_sell_ids' => __( 'Cross-sells', 'woocommerce' ),