From b884a67da37a494ddd85227ddc2a8fd94a47595d Mon Sep 17 00:00:00 2001
From: Lorenzo Milesi <maxxer@yetopen.it>
Date: Wed, 7 Feb 2018 17:15:05 +0100
Subject: [PATCH] Add conflict configuration to composer.json

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 8280b34..ad582b5 100644
--- a/composer.json
+++ b/composer.json
@@ -89,6 +89,10 @@
             "pattern-skip-version": "(-build|-patch)"
         }
     },
+    "conflict": {
+        "dektrium/yii2-rbac": "*",
+        "dektrium/yii2-user": "*"
+    },
     "extra": {
         "bootstrap": "Da\\User\\Bootstrap"
     }