merge with dev, resolve conflict

This commit is contained in:
m0duspwnens
2022-01-11 11:24:10 -05:00
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -664,7 +664,7 @@ up_to_2.3.90() {
}
up_to_2.3.100() {
echo "Updating to Security Onion to 2.3.100"
echo "Updating to Security Onion 2.3.100"
fix_wazuh
}