[Docs] Remove conflict code (#37672)

2019-05-31 20:28:05 +03:00 · 2019-05-31 20:28:05 +03:00 · b0fbb95ca9
parent 3b69003ed9
commit b0fbb95ca9
1 changed files with 0 additions and 8 deletions
--- a/docs/api/role-management/put.asciidoc
+++ b/docs/api/role-management/put.asciidoc
@ -228,7 +228,6 @@ PUT /api/security/role/my_kibana_role
      "query" : "{\"match\": {\"title\": \"foo\"}}"
    } ]
  },
-<<<<<<< HEAD
  "kibana": [
    {
      "base": ["all"],
@ -237,13 +236,6 @@ PUT /api/security/role/my_kibana_role
      "spaces": [
        "default"
      ]
-=======
-  "kibana": {
-    "global": [],
-    "space": {
-      "marketing": ["all"],
-      "engineering": ["read"]
->>>>>>> 83b7ea76b0fd7afcbeff26cd95241ef4b075d12e
    }
  ]
 }