github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.x] [Docs] Remove conflict code (#37672) (#37702)

Browse source
This commit is contained in:
Ahmad Bamieh 2019-06-01 02:50:41 +03:00 • committed by GitHub
parent a02136f303
commit cfdc5f3a0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/api/role-management/put.asciidoc
View file

@ -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
}
]
}