fix merge conflicts

Author: maddie-vargo

CHANGELOG.md

@@ -55,9 +55,6 @@ how a consumer would use the library (e.g. adding unit tests, updating documenta
     - `search` to search for audit-logs.
     - `send-to` to send audit-logs to server.
 
-- `code42 legal-hold show` option:
-    - `--include-devices` to print list of devices associated with legal hold along with total storage by organization.
-
 ## Unreleased
 
 ### Changed

docs/userguides/legalhold.md

@@ -93,4 +93,8 @@ To view all custodians (including inactive) for a legal hold matter, enter
 
 `code42 legal-hold show <matterID> --include-inactive`
 
+To view all devices associated with selected custodians for a legal hold matter, enter
+
+`code42 legal-hold show <matterID> --include-devices`
+
 Learn more about the [Legal Hold](../commands/legalhold.md) commands.

src/code42cli/cmds/legal_hold.py

@@ -111,7 +111,7 @@ def show(state, matter_id, include_inactive=False, include_policy=False):
     inactive_usernames = [
         member["user"]["username"] for member in memberships if not member["active"]
     ]
-
+    
     formatter = OutputFormatter(OutputFormat.TABLE, _MATTER_KEYS_MAP)
     formatter.echo_formatted_list([matter])
     _print_matter_members(active_usernames, member_type="active")