Resolve conflicts

Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König 2020-07-28 09:40:45 +02:00
parent dffb58ae8f
commit 8380112129

View file

@ -214,7 +214,7 @@ os_check() {
fi fi
if [ "$display_warning" = true ]; then if [ "$display_warning" = true ]; then
printf " %b %bUnsupported OS detected%b\\n" "${CROSS}" "${COL_LIGHT_RED}" "${COL_NC}" printf " %b %bUnsupported OS detected: %s%b\\n" "${CROSS}" "${COL_LIGHT_RED}" "${detected_os_pretty}" "${COL_NC}"
printf " https://docs.pi-hole.net/main/prerequesites/#supported-operating-systems\\n" printf " https://docs.pi-hole.net/main/prerequesites/#supported-operating-systems\\n"
printf "\\n" printf "\\n"
printf " e.g: If you are seeing this message on a fresh install, you can run:\\n" printf " e.g: If you are seeing this message on a fresh install, you can run:\\n"