public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-29 14:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict marks

Browse Source
This commit is contained in:
Max Gautier
2019-12-05 14:20:20 +01:00
parent b93274287b
commit a41f4f1fee
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/rancher/v2.x/en/admin-settings/rbac/global-permissions/_index.md
-5
View File
@@ -92,9 +92,6 @@ To change the default global permissions that are assigned to external users upo
1. If you want to remove a default permission, edit the permission and select **No** from **New User Default**. 1. If you want to remove a default permission, edit the permission and select **No** from **New User Default**.
<<<<<<< HEAD
**Result:** The default global permissions are configured based on your changes. Permissions assigned to new users display a check in the **New User Default** column.
=======
**Result:** The default global permissions are configured based on your changes. Permissions assigned to new users display a check in the **New User Default** column. **Result:** The default global permissions are configured based on your changes. Permissions assigned to new users display a check in the **New User Default** column.
### Configuring Global Permissions for Individual Users ### Configuring Global Permissions for Individual Users
@@ -112,5 +109,3 @@ To configure permission for a user,
1. Click **Save.** 1. Click **Save.**
> **Result:** The user's global permissions have been updated. > **Result:** The user's global permissions have been updated.
>>>>>>> Update and clarify docs on global and cluster permissions