OXDEV-7325: Fix some missed merge conflicts

OXID-eSales · Dec 7, 2023 · 3f7703c · 3f7703c
1 parent 97d1014
commit 3f7703c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Shared/Service/CollectionEncodingServiceInterface.php b/src/Shared/Service/CollectionEncodingServiceInterface.php
@@ -7,8 +7,8 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\CollectionEncodingException;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\InvalidCollectionException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\CollectionEncodingException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\InvalidCollectionException;
 
 interface CollectionEncodingServiceInterface
 {

diff --git a/src/Shop/Infrastructure/ShopSettingRepositoryInterface.php b/src/Shop/Infrastructure/ShopSettingRepositoryInterface.php
@@ -7,9 +7,9 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\NoSettingsFoundForShopException;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\WrongSettingTypeException;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\WrongSettingValueException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Exception\NoSettingsFoundForShopException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Exception\WrongSettingTypeException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\WrongSettingValueException;
 
 interface ShopSettingRepositoryInterface
 {

diff --git a/src/Theme/Infrastructure/ThemeSettingRepositoryInterface.php b/src/Theme/Infrastructure/ThemeSettingRepositoryInterface.php
@@ -7,8 +7,8 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\NoSettingsFoundForThemeException;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Exception\WrongSettingValueException;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\Exception\NoSettingsFoundForThemeException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\WrongSettingValueException;
 
 interface ThemeSettingRepositoryInterface
 {