Merge branch 'master' into release-merge-fix

# Conflicts:
#	README.md
#	VERIFY_ISO.md
#	VERSION
#	salt/docker_clean/init.sls
#	salt/soc/files/soc/changes.json
This commit is contained in:
William Wernert
2021-03-01 10:45:51 -05:00
2 changed files with 1 additions and 1 deletions

View File

@@ -84,7 +84,7 @@ while [[ $INSTALL != "yes" ]] && [[ $INSTALL != "no" ]]; do
echo "## ##" echo "## ##"
echo "## Installing the Security Onion ##" echo "## Installing the Security Onion ##"
echo "## analyst node on this device will ##" echo "## analyst node on this device will ##"
echo "## make permanenet changes to ##" echo "## make permanent changes to ##"
echo "## the system. ##" echo "## the system. ##"
echo "## ##" echo "## ##"
echo "###########################################" echo "###########################################"

Binary file not shown.