From 26434d8e226e77bd6f5284f012b59910e6274f9d Mon Sep 17 00:00:00 2001
From: Christian Lopez <ralkage@live.com>
Date: Sun, 13 May 2018 18:24:21 -0400
Subject: [PATCH] Added conflict with flagrow/terms

See #20
---
 composer.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 4dca0e3..4da40c2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
         },
 
         {
-          "name": "Charlie K",
-          "email": "issyrocks12@reflar.email",
-          "homepage": "https://reflar.io"
+            "name": "Charlie K",
+            "email": "issyrocks12@reflar.email",
+            "homepage": "https://reflar.io"
         }
     ],
     "support": {
@@ -31,7 +31,10 @@
     "require": {
         "flarum/core": "^0.1.0-beta.6"
     },
-      "autoload": {
+    "conflict": {
+        "flagrow/terms": ">=0.1.0"
+    },
+    "autoload": {
         "psr-4": {
             "Reflar\\UserManagement\\": "src/"
         }
@@ -46,4 +49,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}