Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
markusmichalski-fc committed Sep 10, 2020
2 parents dddf1d8 + d0db263 commit e3f5887
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Services/Helper/ShopwareArticleHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -1135,10 +1135,11 @@ public function importArticle(
}
catch(OptimisticLockException $e) {
$this->logger->error('Error storing base article values!');
continue;
} catch (ORMException $e) {
$this->logger->error('Error storing base article values!');
continue;
}
continue;
}

$shopwareArticle->setSupplier($this->getSupplier($valueArticle->getManufacturer()));
Expand Down

0 comments on commit e3f5887

Please sign in to comment.