HBSD: fixed merge conflict in bsdinstall

Signed-off-by: Oliver Pinter <[email protected]>
HardenedBSD · Sep 14, 2017 · 96eb3e0 · 96eb3e0
1 parent ed3e694
commit 96eb3e0
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/usr.sbin/bsdinstall/scripts/checksum b/usr.sbin/bsdinstall/scripts/checksum
@@ -62,21 +62,16 @@ for dist in $DISTRIBUTIONS; do
 		percentage=$(echo $percentage + 100/`echo $DISTRIBUTIONS | wc -w` | bc)
 	else
 		eval "status_$distname=1"
-<<<<<<< HEAD
-		dialog --backtitle "HardenedBSD Installer" --title "Error" \
-		    --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0
-=======
 		case $(/bin/freebsd-version -u) in
 		*-ALPHA*|*-CURRENT|*-STABLE|*-PRERELEASE)
-			dialog --backtitle "FreeBSD Installer" --title "Error" \
-			    --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of FreeBSD. Please check for a newer snapshot." 0 0
+			dialog --backtitle "HardenedBSD Installer" --title "Error" \
+			    --msgbox "The checksum for $dist does not match. It may have become corrupted, or it may be from a newer version of HardenedBSD. Please check for a newer version/snapshot." 0 0
 			;;
 		*)
-			dialog --backtitle "FreeBSD Installer" --title "Error" \
+			dialog --backtitle "HardenedBSD Installer" --title "Error" \
 			    --msgbox "The checksum for $dist does not match. It may have become corrupted, and should be redownloaded." 0 0
 			;;
 		esac
->>>>>>> origin/freebsd/11-stable/master
 		exit 1
 	fi
 done