Skip to content

Commit c5c9332

Browse files
committed
Run prettier (#3806)
1 parent 17c9b0c commit c5c9332

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ Data capture is frequently used with cloud sync.
2929
You can start and stop capture and sync independently.
3030
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.
3131
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.
32+
<<<<<<< HEAD
3233
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.
34+
=======
35+
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.
36+
>>>>>>> e29141c98 (Run prettier)
3337
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).
3438
3539
{{% /tab %}}

docs/manage/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ Viam's fleet management tooling allows you to remotely deploy and manage softwar
5151
<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" >
5252
<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" >
5353

54-
</div>
54+
</div>

docs/manage/troubleshoot/alert.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ If you are on another operating system, telegraf will be installed automatically
6565

6666
{{% /expand%}}
6767

68-
6968
{{< alert title="Note" color="note" >}}
7069
You must run `viam-server` with `sudo` to monitor machine performance metrics.
7170
{{< /alert >}}
@@ -671,7 +670,7 @@ To configure your trigger by using **JSON** mode instead of **Builder** mode, pa
671670
{
672671
"name": "trigger-1",
673672
"event": {
674-
"type": "part_offline",
673+
"type": "part_offline"
675674
},
676675
"notifications": [
677676
{

0 commit comments

Comments
 (0)