fix docs

Author: 3nids

docs/docs/roles.md

@@ -139,8 +139,6 @@ for name in result.other_login_roles:
     print(f"Login role with no schema access: {name}")
 ```
 
-<<<<<<< Updated upstream
-=======
 ## Login Roles
 
 PUM provides utilities to manage login roles (database users) independently of
@@ -194,17 +192,13 @@ for name in RoleManager.members_of(connection=conn, role_name="tww_viewer"):
     print(name)
 ```
 
->>>>>>> Stashed changes
 ## Summary
 
 - Define roles and permissions in your config YAML under the `roles` key.
 - Use inheritance to avoid duplication and build role hierarchies.
 - Each permission specifies a type and a list of schemas.
 - The system ensures only valid roles and permissions are created and applied.
 - Use `role list` to audit which roles have access to the module's schemas.
-<<<<<<< Updated upstream
-=======
 - Use `role create-login`, `role drop-login`, `role login-roles`, and `role members` to manage login users.
->>>>>>> Stashed changes
 
 For more details, see the [configuration](./configuration.md) page or the [RoleManager](./api/role_manager.md) class.

docs/mkdocs.yml

@@ -8,13 +8,13 @@ theme:
   name: "material"
   logo: assets/images/pum.png
   favicon: assets/images/favicon.ico
-  # features:
+  features:
   #   - navigation.tabs
   #   - navigation.tabs.sticky
   #   - navigation.expand
-  #   - navigation.indexes
-  #   - navigation.top
-  #   - navigation.tracking
+    - navigation.indexes
+    - navigation.top
+    - navigation.tracking
   #   - pymdownx.highlight:
   #       anchor_linenums: true
   #       line_spans: __span