Merge branch '3.1' into next

coreshop · Jun 1, 2023 · 85a6a2b · 85a6a2b
2 parents 1780620 + 350ab75
commit 85a6a2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistRepository.php b/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistRepository.php
@@ -18,6 +18,7 @@
 
 namespace CoreShop\Bundle\WishlistBundle\Pimcore\Repository;
 
+use Carbon\Carbon;
 use CoreShop\Bundle\ResourceBundle\Pimcore\PimcoreRepository;
 use CoreShop\Component\StorageList\Model\StorageListInterface;
 use CoreShop\Component\Wishlist\Model\WishlistInterface;

diff --git a/src/CoreShop/Component/Product/composer.json b/src/CoreShop/Component/Product/composer.json
@@ -51,8 +51,13 @@
  "prefer-stable": true,
  "extra": {
  "branch-alias": {
+<<<<<<< HEAD
  "dev-next": "4.0-dev",
  "dev-master": "4.0-dev"
+=======
+ "dev-next": "3.1-dev",
+ "dev-master": "3.1-dev"
+>>>>>>> 3.1
  }
  },
  "config": {

diff --git a/src/CoreShop/Component/Wishlist/composer.json b/src/CoreShop/Component/Wishlist/composer.json
@@ -53,8 +53,13 @@
  "prefer-stable": true,
  "extra": {
  "branch-alias": {
+<<<<<<< HEAD
  "dev-next": "4.0-dev",
  "dev-master": "4.0-dev"
+=======
+ "dev-next": "3.1-dev",
+ "dev-master": "3.1-dev"
+>>>>>>> 3.1
  }
  }
 }