From 845fc81932d9b66c415efbb6aeff8f25848979bc Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Mon, 5 Jan 2026 11:11:28 +0100
Subject: conflict

---
 topics/octopus/lizardfs/lizard-maintenance.gmi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/topics/octopus/lizardfs/lizard-maintenance.gmi b/topics/octopus/lizardfs/lizard-maintenance.gmi
index ef04b69d..a34ef3ec 100644
--- a/topics/octopus/lizardfs/lizard-maintenance.gmi
+++ b/topics/octopus/lizardfs/lizard-maintenance.gmi
@@ -73,6 +73,7 @@ Chunks deletion state:
         2ssd    7984    -       -       -       -       -       -       -       -       -       -
 ```
 
+<<<<<<< HEAD
 This table essentially says that slow and fast are replicating data (if they are in column 0 it is OK!). This looks good for fast:
 
 ```
@@ -81,6 +82,7 @@ Chunks replication state:
         slow    -       137461  448977  -       -       -       -       -       -       -       -
         fast    6133152 -       5       -       -       -       -       -       -       -       -
 ```
+This table essentially says that slow and fast are replicating data (if they are in column 0 it is OK!).
 
 To query how the individual disks are filling up and if there are any errors:
 
-- 
cgit 1.4.1