summary refs log tree commit diff
path: root/topics/octopus/lizardfs/lizard-maintenance.gmi
diff options
context:
space:
mode:
Diffstat (limited to 'topics/octopus/lizardfs/lizard-maintenance.gmi')
-rw-r--r--topics/octopus/lizardfs/lizard-maintenance.gmi1
1 files changed, 0 insertions, 1 deletions
diff --git a/topics/octopus/lizardfs/lizard-maintenance.gmi b/topics/octopus/lizardfs/lizard-maintenance.gmi
index a34ef3e..318eabc 100644
--- a/topics/octopus/lizardfs/lizard-maintenance.gmi
+++ b/topics/octopus/lizardfs/lizard-maintenance.gmi
@@ -73,7 +73,6 @@ 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:
 
 ```