resolve conflict

eriocnemis · Nov 15, 2021 · b028418 · b028418
2 parents 42b5686 + f2f276f
commit b028418
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,8 +12,9 @@ repos:
     -   id: pretty-format-json
         args: ["--indent=4", "--autofix", "--no-sort-keys"]
 -   repo: https://github.com/eriocnemis/git.MagentoPreCommitHooks
-    rev: 1.0.8
+    rev: 1.0.10
     hooks:
+    -   id: magento-xml
     -   id: magento-phpcs
         args: ["--autofix"]
     -   id: magento-phpmd

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Version | 2.0.* | 2.1.* | 2.2.* | 2.3.* | 2.4.*
 Magento Community | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
 Magento Enterprise | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
 Magento Cloud | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
-Extension version | [2.0.2](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.0.2.zip) | [2.1.2](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.1.2.zip) | [2.2.2](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.2.2.zip) | [2.3.2](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.3.1.zip) |[2.4.2](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.4.2.zip)
+Extension version | [2.0.3](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.0.3.zip) | [2.1.3](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.1.3.zip) | [2.2.3](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.2.3.zip) | [2.3.3](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.3.3.zip) |[2.4.3](https://github.com/eriocnemis/m2.ExchangeEcb/archive/2.4.3.zip)
 
 ## Install
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "eriocnemis/module-exchange-ecb",
     "description": "The extension retrieves currency exchange rates from the European Central Bank.",
     "type": "magento2-module",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "authors": [
         {
             "name": "Eriocnemis Team",
@@ -19,10 +19,10 @@
     },
     "autoload": {
         "files": [
-            "registration.php"
+            "src/registration.php"
         ],
         "psr-4": {
-            "Eriocnemis\\ExchangeEcb\\": ""
+            "Eriocnemis\\ExchangeEcb\\": "src"
         }
     }
 }
diff --git a/Model/Currency/Gateway.php → src/Model/Currency/Gateway.php b/Model/Currency/Gateway.php → src/Model/Currency/Gateway.php
diff --git a/Model/Currency/Import.php → src/Model/Currency/Import.php b/Model/Currency/Import.php → src/Model/Currency/Import.php
diff --git a/Model/Currency/Rate.php → src/Model/Currency/Rate.php b/Model/Currency/Rate.php → src/Model/Currency/Rate.php
diff --git a/etc/adminhtml/system.xml → src/etc/adminhtml/system.xml b/etc/adminhtml/system.xml → src/etc/adminhtml/system.xml
diff --git a/etc/config.xml → src/etc/config.xml b/etc/config.xml → src/etc/config.xml
diff --git a/etc/di.xml → src/etc/di.xml b/etc/di.xml → src/etc/di.xml
diff --git a/etc/module.xml → src/etc/module.xml b/etc/module.xml → src/etc/module.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Eriocnemis_ExchangeEcb" setup_version="2.1.2">
+    <module name="Eriocnemis_ExchangeEcb" setup_version="2.1.3">
         <sequence>
             <module name="Magento_Directory"/>
             <module name="Magento_Store"/>

diff --git a/i18n/en_US.csv → src/i18n/en_US.csv b/i18n/en_US.csv → src/i18n/en_US.csv
diff --git a/registration.php → src/registration.php b/registration.php → src/registration.php