fix: fix merge conflict

Signed-off-by: Stephan Wendel <[email protected]>
mainsail-crew · Oct 20, 2023 · f1d0430 · f1d0430
1 parent d6f1419
commit f1d0430
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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