Merge pull request #143 from maxxer/fix-composer

Add conflict configuration to composer.json

CHANGELOG.md

@@ -7,6 +7,8 @@
 - Bug #125: Fix validation in non-ajax requests (faenir)
 - Bug #122: Fix wrong email message for email address change (liviuk2)
 - Bug #102: Implemented password expiration feature (maxxer)
+- Enh #143: Introduced "conflict" configuration in composer.json (maxxer)
+- Enh #145: Allowed the `+` sign in username (maxxer)
 - Bug #9:   Documentation about migration from Dektrium tools (maxxer)
 
 ## 1.1.1 - November 27, 2017

composer.json

@@ -89,6 +89,10 @@
             "pattern-skip-version": "(-build|-patch)"
         }
     },
+    "conflict": {
+        "dektrium/yii2-rbac": "*",
+        "dektrium/yii2-user": "*"
+    },
     "extra": {
         "bootstrap": "Da\\User\\Bootstrap"
     }