From b0fbb95ca9b855d152c5993b6d30eff18c9817bf Mon Sep 17 00:00:00 2001
From: Ahmad Bamieh <ahmadbamieh@gmail.com>
Date: Fri, 31 May 2019 20:28:05 +0300
Subject: [PATCH] [Docs] Remove conflict code (#37672)

---
 docs/api/role-management/put.asciidoc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/api/role-management/put.asciidoc b/docs/api/role-management/put.asciidoc
index 46e6754cf47d..e02445adfb19 100644
--- 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
     }
   ]
 }