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

fix conflicts

This commit is contained in:
Manos Psychogyiopoulos 2014-06-25 10:36:11 +03:00
parent 0e623e2c50
commit 6ad8f0f718
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/admin/meta-boxes/views/html-order-item.php
View File

@ -4,7 +4,7 @@ if ( ! defined( 'ABSPATH' ) ) {
} }
?> ?>
<tr class="item <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>"> <tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item ); ?>" data-order_item_id="<?php echo $item_id; ?>">
<td class="check-column"><input type="checkbox" /></td> <td class="check-column"><input type="checkbox" /></td>
<td class="thumb"> <td class="thumb">
<?php if ( $_product ) : ?> <?php if ( $_product ) : ?>