Run prettier (#3806)

docs/data-ai/capture-data/advanced/how-sync-works.md

@@ -29,7 +29,11 @@ Data capture is frequently used with cloud sync.
 You can start and stop capture and sync independently.
 You can also enable cloud sync without data capture and it will sync data in either the sync directory or in the additional sync paths configured in the `viam-server` config.
 If a file in either the data capture directory or any of the sync paths ends with <file>.capture</file> it will be treated as a file with data that was captured by data capture.
+<<<<<<< HEAD
 If it ends in <file>.prog</file> it will be ignored as this extension is used by data capture to denote that a file is a capture file that's currently being written to.
+=======
+If it ends in `.prog` it will be ignored as this extension is used by data capture to denote that a file is a capture file that's currently being written to.
+>>>>>>> e29141c98 (Run prettier)
 If a file is in the capture directory or one of its descendants or any of the additional sync paths or their descendants and doesn't have <file>.prog</file> nor <file>.capture</file> extensions, it will be treated as an arbitrary file and, like <file>.capture</file> files, synced if data sync is enabled and the robot is able to connect to [the Viam app](https://app.viam.com).
 
 {{% /tab %}}

docs/manage/_index.md

@@ -51,4 +51,4 @@ Viam's fleet management tooling allows you to remotely deploy and manage softwar
 <img src="../platform/platform-fleet-team.svg" alt="Platform diagram with team management elements highlighted" class="aligncenter imgzoom medium-zoom-image" id="fleet-platform-team" style="width:800px" >
 <img src="../platform/platform-fleet-monitor.svg" alt="Platform diagram with monitoring elements highlighted" class="aligncenter imgzoom medium-zoom-image" id="fleet-platform-monitor" style="width:800px" >
 
-</div>
+</div>

docs/manage/troubleshoot/alert.md

@@ -65,7 +65,6 @@ If you are on another operating system, telegraf will be installed automatically
 
 {{% /expand%}}
 
-
 {{< alert title="Note" color="note" >}}
 You must run `viam-server` with `sudo` to monitor machine performance metrics.
 {{< /alert >}}
@@ -671,7 +670,7 @@ To configure your trigger by using **JSON** mode instead of **Builder** mode, pa
     {
       "name": "trigger-1",
       "event": {
-        "type": "part_offline",
+        "type": "part_offline"
       },
       "notifications": [
         {