symfony/yaml version conflict fixes

btaens · Jun 21, 2016 · 37b5215 · 37b5215
1 parent 6f091eb
commit 37b5215
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ hierarchy:
        - FINANCE
        - LABOR
    ADMIN:
-       - @MODERATOR
+       - "@MODERATOR"
        - SALES
        - CONTACT
    USER:

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": ">=5.4.16",
         "cakephp/cakephp": "~3.0",
-        "symfony/yaml": "~2.6"
+        "symfony/yaml": ">=2.6"
     },
     "authors": [
         {

diff --git a/config/hierarchy.sample.yml b/config/hierarchy.sample.yml
@@ -6,7 +6,7 @@ hierarchy:
        - FINANCE
        - LABOR
    ADMIN:
-       - @MODERATOR # All roles in MODERATOR now have all access rights of ADMIN
+       - "@MODERATOR" # All roles in MODERATOR now have all access rights of ADMIN
        - SALES
        - CONTACT
    USER:
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ hierarchy: @@
            - FINANCE
            - LABOR
        ADMIN:
-           - @MODERATOR
+           - "@MODERATOR"
            - SALES
            - CONTACT
        USER:
@@ Expand Down @@