resolve conflict

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -32,4 +32,3 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 <!--- Tell us what happened instead. Include error messages and issues. -->
 1. [Screenshots, logs or description]
 2.
-

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: mixed-line-ending
+        args: ['--fix=lf']
+    -   id: trailing-whitespace
+    -   id: check-xml
+    -   id: check-yaml
+    -   id: check-json
+    -   id: pretty-format-json
+        args: ["--indent=4", "--autofix", "--no-sort-keys"]
+-   repo: https://github.com/eriocnemis/git.MagentoPreCommitHooks
+    rev: 1.0.10
+    hooks:
+    -   id: magento-xml
+    -   id: magento-phpcs
+        args: ["--autofix"]
+    -   id: magento-phpmd
+    -   id: magento-phpcpd
+    -   id: magento-phpstan

COPYING.txt

@@ -2,4 +2,4 @@ Copyright © 2011-2019 Eriocnemis Team ([email protected])
 Each Eriocnemis source file included in this distribution is licensed under OSL 3.0
 
 http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-Please see LICENSE.md for the full text of the OSL 3.0 license.
+Please see LICENSE.md for the full text of the OSL 3.0 license.

LICENSE.md

@@ -15,7 +15,7 @@ Licensed under the Open Software License version 3.0
 
          4. to perform the Original Work publicly; and
 
-         5. to display the Original Work publicly. 
+         5. to display the Original Work publicly.
 
    2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
 
@@ -45,4 +45,4 @@ Licensed under the Open Software License version 3.0
 
   15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
 
-  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. 
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

README.md

@@ -25,7 +25,7 @@ Version | 2.0.* | 2.1.* | 2.2.* | 2.3.* | 2.4.*
 Magento Community | - | - | - | :heavy_check_mark: | :heavy_check_mark:
 Magento Enterprise | - | - | - | :heavy_check_mark: | :heavy_check_mark:
 Magento Cloud | - | - | - | :heavy_check_mark: | :heavy_check_mark:
-Extension version | - | - | - | 2.3.2 | 2.4.1
+Extension version | - | - | - | 2.3.2 | 2.4.2
 
 ## Install
 
@@ -35,12 +35,18 @@ Extension version | - | - | - | 2.3.2 | 2.4.1
 
 2. Enter following commands to install module:
 
-     For Magento CE 2.3.x
+     For Magento CE(EE) 2.3.x
 
     ```bash
     composer require eriocnemis/module-region-kit:2.3.*
     ```
 
+     For Magento CE(EE) 2.4.x
+
+    ```bash
+    composer require eriocnemis/module-region-kit:2.4.*
+    ```
+
    Wait while dependencies are updated.
 
 #### Completion of installation

composer.json

@@ -3,28 +3,31 @@
     "description": "The extension allows you to manage geographic regions. For each country, you can add the any region, whose name is based on a specific locale.",
     "type": "magento2-module",
     "version": "2.3.2",
-    "authors": [{
-        "name": "Eriocnemis Team",
-        "email": "[email protected]"
-    }],
+    "authors": [
+        {
+            "name": "Eriocnemis Team",
+            "email": "[email protected]"
+        }
+    ],
     "license": [
         "OSL-3.0"
     ],
     "require": {
-        "eriocnemis/module-region-api": "2.3.*",
-        "eriocnemis/module-region": "2.3.*",
-        "eriocnemis/module-region-admin-ui": "2.3.*",
-        "eriocnemis/module-region-shipping-rule-api": "2.3.*",
-        "eriocnemis/module-region-shipping-rule": "2.3.*",
-        "eriocnemis/module-region-shipping-rule-admin-ui": "2.3.*",
-        "eriocnemis/module-region-import": "2.3.*"
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "eriocnemis/module-region-api": "2.3.2",
+        "eriocnemis/module-region": "2.3.2",
+        "eriocnemis/module-region-admin-ui": "2.3.2",
+        "eriocnemis/module-region-shipping-rule-api": "2.3.2",
+        "eriocnemis/module-region-shipping-rule": "2.3.2",
+        "eriocnemis/module-region-shipping-rule-admin-ui": "2.3.2",
+        "eriocnemis/module-region-import": "2.3.2"
     },
     "autoload": {
         "files": [
-            "registration.php"
+            "src/registration.php"
         ],
         "psr-4": {
-            "Eriocnemis\\RegionKit\\": ""
+            "Eriocnemis\\RegionKit\\": "src"
         }
     }
 }