From f1d0430ab4a540ab46f5b7052106b5f2b5d60f96 Mon Sep 17 00:00:00 2001
From: Stephan Wendel <me@stephanwe.de>
Date: Fri, 20 Oct 2023 18:22:43 +0200
Subject: [PATCH] fix: fix merge conflict

Signed-off-by: Stephan Wendel <me@stephanwe.de>
---
 src/modules/postrename/filesystem/root/postrename | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/postrename/filesystem/root/postrename b/src/modules/postrename/filesystem/root/postrename
index 8c3631887..0cef0f1f9 100644
--- a/src/modules/postrename/filesystem/root/postrename
+++ b/src/modules/postrename/filesystem/root/postrename
@@ -240,14 +240,11 @@ echo -en "${WHITE}Fix broken symlinks ...${NOC}\r"
 fix_broken_links
 fix_timelapse_links
 fix_mainsailcfg_links
-<<<<<<< HEAD
 # Optional if kiauh module is used
 if [[ -d "/home/${DEFAULT_USER}/kiauh" ]]; then
     fix_kiauh_links
 fi
-=======
 fix_cn_links
->>>>>>> develop
 echo -e "${WHITE}Fix broken symlinks ...${NOC}[${GRE}OK${NOC}]"
 ## do a short break
 sleep 2