From 960839ed7654f5a8fbf32869e4b87f70e11e988a Mon Sep 17 00:00:00 2001
From: kyle <kyle@reliabilitytech.ca>
Date: Wed, 7 Oct 2026 21:01:23 +0000
Subject: [PATCH] Update collectors/veeam/README.md

---
 collectors/veeam/README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/collectors/veeam/README.md b/collectors/veeam/README.md
index f556f4b..9b9f6ff 100644
--- a/collectors/veeam/README.md
+++ b/collectors/veeam/README.md
@@ -5,7 +5,6 @@ It covers jobs returned by `Get-VBRJob`: VM backup, replication and backup copy
 
 ## Install (on the VBR server, as an administrator)
 
-<<<<<<< HEAD
 =======
 Requires PowerShell 7 installed machine-wide (`winget install Microsoft.PowerShell` or the MSI),
 which VBR 13's Veeam module expects. The Microsoft Store version won't work, because the SYSTEM
@@ -16,7 +15,6 @@ account can't run it. The installer checks for this before changing anything.
    ```bash
    python manage.py create-key veeam-acme
    ```
-<<<<<<< HEAD
 2. Copy this folder to the VBR server and run:
 =======
 2. Copy this folder to the VBR server and run, from PowerShell 7 (`pwsh`):
@@ -27,7 +25,6 @@ account can't run it. The installer checks for this before changing anything.
    It prompts for the key, then:
    - writes `C:\ProgramData\BackupDashboard\veeam-collector.json` (readable only by SYSTEM and Administrators)
    - copies the script to `C:\Program Files\BackupDashboard\`
-<<<<<<< HEAD
    - registers the scheduled task **Backup Dashboard - Veeam collector** (SYSTEM, every 15 minutes)
 3. Preview the payloads, then backfill 30 days so the history view is populated straight away:
 =======
@@ -56,7 +53,6 @@ delete the scheduled task and both `BackupDashboard` folders.
 | Message | Session reason, each VM or object that didn't succeed, and warning/error lines from the session log |
 | Size | `BackupStats.BackupSize` |
 
-<<<<<<< HEAD
 =======
 **Backup copy jobs (VBR 12+):** Veeam records their sessions under hidden per-source "worker" jobs.
 The collector files each worker session under its copy job (via the worker's `PolicyJobId`), so a
@@ -73,7 +69,6 @@ down) fill in automatically. Sessions already delivered are recorded in
 - Exit codes: `0` OK, `1` some jobs failed to send (they're retried next run), `2` setup failed
   (config, Veeam module, or Veeam connection).
 - `API key rejected`: the key was revoked or mistyped. Re-run the installer with a new key.
-<<<<<<< HEAD
 =======
 - A job shows **Unknown** on the dashboard: the collector sent the job but matched no sessions to it.
   Run `.\Get-VeeamCollectorDiagnostics.ps1` (read-only). It lists sessions whose job ID matches no