Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Amazon/Listing/Grid.php # app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Ebay/Listing/Grid.php # app/code/Ess/M2ePro/Model/Order.php
Magestore · Mar 19, 2018 · 83fb5b0 · 83fb5b0
2 parents 518cbc9 + efc11e5
commit 83fb5b0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 5 deletions.
diff --git a/app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Amazon/Listing/Grid.php b/app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Amazon/Listing/Grid.php
@@ -11,7 +11,6 @@ class Grid extends \Ess\M2ePro\Block\Adminhtml\Amazon\Listing\Grid
 {
     public function callbackColumnTitle($value, $row, $column, $isExport)
     {
-
         $html = parent::callbackColumnTitle($value, $row, $column, $isExport);
         /* m2e integration with Inventory_success*/
         $warehouse =  $this->__('Warehouse');

diff --git a/app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Ebay/Listing/Grid.php b/app/code/Ess/M2ePro/Block/Adminhtml/Rewrite/Ebay/Listing/Grid.php
@@ -19,7 +19,6 @@ class Grid extends \Ess\M2ePro\Block\Adminhtml\Ebay\Listing\Grid
      */
     public function callbackColumnTitle($value, $row, $column, $isExport)
     {
-
         $html = parent::callbackColumnTitle($value, $row, $column, $isExport);
         /* m2e integration with Inventory_success*/
         $warehouse =  $this->__('Warehouse');

diff --git a/app/code/Ess/M2ePro/Model/Order.php b/app/code/Ess/M2ePro/Model/Order.php
@@ -12,7 +12,6 @@
  */
 class Order extends ActiveRecord\Component\Parent\AbstractModel
 {
-
     // M2ePro\TRANSLATIONS
     // Magento Order was not created. Reason: %msg%
     // Magento Order #%order_id% was created.

diff --git a/app/code/Magestore/M2eIntegration/composer.json b/app/code/Magestore/M2eIntegration/composer.json
@@ -8,7 +8,7 @@
     "OSL-3.0",
     "AFL-3.0"
   ],
-  "version": "1.0.0",
+  "version": "1.1.0",
   "authors": [
     {
       "name": "magestore",

diff --git a/app/code/Magestore/M2eIntegration/etc/module.xml b/app/code/Magestore/M2eIntegration/etc/module.xml
@@ -5,7 +5,7 @@
   -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magestore_M2eIntegration" setup_version="1.0.0">
+    <module name="Magestore_M2eIntegration" setup_version="1.1.0">
         <sequence>
             <module name="Ess_M2ePro"/>
         </sequence>